From 3499a51dc1ef09f77aeed6b98c24623f3ca8d36a Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sat, 29 Mar 2003 00:28:00 +0000
Subject: [PATCH] Revert previous commit

---
 clients/tools/Makefile.in     | 64 ++++++++++++++++++++---------------
 clients/tools/ldapcompare.c   |  3 --
 clients/tools/ldapcompare.dsp | 19 -----------
 clients/tools/ldapdelete.c    |  4 ---
 clients/tools/ldapdelete.dsp  | 19 -----------
 clients/tools/ldapmodify.c    |  4 ---
 clients/tools/ldapmodify.dsp  | 19 -----------
 clients/tools/ldapmodrdn.c    |  4 ---
 clients/tools/ldapmodrdn.dsp  | 19 -----------
 clients/tools/ldappasswd.c    |  4 ---
 clients/tools/ldappasswd.dsp  | 19 -----------
 clients/tools/ldapsearch.c    |  4 ---
 clients/tools/ldapsearch.dsp  | 19 -----------
 clients/tools/ldapwhoami.c    |  4 ---
 clients/tools/ldapwhoami.dsp  | 19 -----------
 15 files changed, 36 insertions(+), 188 deletions(-)

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index eb009cc6b2..7685d1292e 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -22,47 +22,55 @@ PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn \
 	ldappasswd ldapwhoami ldapcompare
 
 
-ldapsearch:	ldapsearch.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapsearch.o common.o $(LIBS)
+ldapsearch:	ldsversion.o
+	$(LTLINK) -o $@ ldapsearch.o common.o ldsversion.o $(LIBS)
 
-ldapmodify:	ldapmodify.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapmodify.o common.o $(LIBS)
+ldapmodify:	ldmversion.o
+	$(LTLINK) -o $@ ldapmodify.o common.o ldmversion.o $(LIBS)
 
-ldapdelete:	ldapdelete.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapdelete.o common.o $(LIBS)
+ldapdelete:	lddversion.o
+	$(LTLINK) -o $@ ldapdelete.o common.o lddversion.o $(LIBS)
 
-ldapmodrdn:	ldapmodrdn.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapmodrdn.o common.o $(LIBS)
+ldapmodrdn:	ldrversion.o
+	$(LTLINK) -o $@ ldapmodrdn.o common.o ldrversion.o $(LIBS)
 
-ldappasswd:	ldappasswd.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldappasswd.o common.o $(LIBS)
+ldappasswd:	ldpversion.o
+	$(LTLINK) -o $@ ldappasswd.o common.o ldpversion.o $(LIBS)
 
-ldapwhoami:	ldapwhoami.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapwhoami.o common.o $(LIBS)
+ldapwhoami:	ldwversion.o
+	$(LTLINK) -o $@ ldapwhoami.o common.o ldwversion.o $(LIBS)
 
-ldapcompare: ldapcompare.o common.o $(XLIBS)
-	$(LTLINK) -o $@ ldapcompare.o common.o $(LIBS)
+ldapcompare: ldcversion.o
+	$(LTLINK) -o $@ ldapcompare.o common.o ldcversion.o $(LIBS)
 
-ldapsearch.o:	$(srcdir)/ldapsearch.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+ldsversion.c: ldapsearch.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapsearch > $@
 
-ldapmodify.o:	$(srcdir)/ldapmodify.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+ldmversion.c: ldapmodify.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapmodify > $@
 
-ldapdelete.o:	$(srcdir)/ldapdelete.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+lddversion.c: ldapdelete.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapdelete > $@
 
-ldapmodrdn.o:	$(srcdir)/ldapmodrdn.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+ldpversion.c: ldappasswd.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldappasswd > $@
 
-ldappasswd.o:	$(srcdir)/ldappasswd.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+ldrversion.c: ldapmodrdn.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapmodrdn > $@
 
-ldapwhoami.o:	$(srcdir)/ldapwhoami.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
+ldwversion.c: ldapwhoami.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapwhoami > $@
+
+ldcversion.c: ldapcompare.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapcompare > $@
 
-ldapcompare.o:	$(srcdir)/ldapcompare.c
-	$(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
 install-local:	FORCE
 	-$(MKDIR) $(DESTDIR)$(bindir)
diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index c940dfcaff..18ea6efee7 100644
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -35,9 +35,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapcompare"
-#define	_OLV_STATIC
-#include "ol_version.h"
 
 static int quiet = 0;
 
diff --git a/clients/tools/ldapcompare.dsp b/clients/tools/ldapcompare.dsp
index a6b9613eb3..ab31707cdc 100644
--- a/clients/tools/ldapcompare.dsp
+++ b/clients/tools/ldapcompare.dsp
@@ -148,25 +148,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapcompare.c
-
-!IF "$CFG)" == "ldapcompare - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapcompare - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 7614b50b50..d3638404a5 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -21,10 +21,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapdelete"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 static int	prune = 0;
 
diff --git a/clients/tools/ldapdelete.dsp b/clients/tools/ldapdelete.dsp
index 9140cbdbbf..c136d67c8a 100644
--- a/clients/tools/ldapdelete.dsp
+++ b/clients/tools/ldapdelete.dsp
@@ -148,25 +148,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapdelete.c
-
-!IF "$CFG)" == "ldapdelete - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapdelete - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 61aab664d3..d4f452b95e 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -36,10 +36,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapmodify"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 static int	ldapadd, force = 0;
 static char *rejfile = NULL;
diff --git a/clients/tools/ldapmodify.dsp b/clients/tools/ldapmodify.dsp
index 459110a987..ffa4e68df8 100644
--- a/clients/tools/ldapmodify.dsp
+++ b/clients/tools/ldapmodify.dsp
@@ -148,25 +148,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapmodify.c
-
-!IF "$CFG)" == "ldapmodify - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodify - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 0d7ba818bb..225e536657 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -34,10 +34,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapmodrdn"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 static char	*newSuperior = NULL;
 static int   remove_old_RDN = 0;
diff --git a/clients/tools/ldapmodrdn.dsp b/clients/tools/ldapmodrdn.dsp
index 9ffe888233..d1304ce84c 100644
--- a/clients/tools/ldapmodrdn.dsp
+++ b/clients/tools/ldapmodrdn.dsp
@@ -148,25 +148,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapmodrdn.c
-
-!IF "$CFG)" == "ldapmodrdn - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index fb74291095..a0265f4ebd 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -23,10 +23,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldappasswd"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 static char	*newpw = NULL;
 static char	*oldpw = NULL;
diff --git a/clients/tools/ldappasswd.dsp b/clients/tools/ldappasswd.dsp
index 5f6a186056..7aa142c7d4 100644
--- a/clients/tools/ldappasswd.dsp
+++ b/clients/tools/ldappasswd.dsp
@@ -144,25 +144,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldappasswd.c
-
-!IF "$CFG)" == "ldappasswd - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldappasswd - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index c3ec8c06c2..67beac471e 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -36,10 +36,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapsearch"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 static int scope = LDAP_SCOPE_SUBTREE;
 static int deref = -1;
diff --git a/clients/tools/ldapsearch.dsp b/clients/tools/ldapsearch.dsp
index 2b2d2f7000..de7f3e9723 100644
--- a/clients/tools/ldapsearch.dsp
+++ b/clients/tools/ldapsearch.dsp
@@ -148,25 +148,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapsearch.c
-
-!IF "$CFG)" == "ldapsearch - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapsearch - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 1910c3a659..4ccb11aea2 100644
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -23,10 +23,6 @@
 
 #include "common.h"
 
-#define _OLV_APP	"ldapwhoami"
-#define	_OLV_STATIC
-#include "ol_version.h"
-
 
 void
 usage( void )
diff --git a/clients/tools/ldapwhoami.dsp b/clients/tools/ldapwhoami.dsp
index daf953b7fd..c4bdaa014a 100644
--- a/clients/tools/ldapwhoami.dsp
+++ b/clients/tools/ldapwhoami.dsp
@@ -144,25 +144,6 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapwhoami.c
-
-!IF "$CFG)" == "ldapwhoami - Win32 Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Debug"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Release"
-
-# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
-
-!ENDIF
-
 # End Source File
 # End Target
 # End Project
-- 
2.39.5