Revert previous commit

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index eb009cc6b22de1b29f875f3001891ae8cf5362b7..7685d1292e8bcf550544ad588a425f4322f8b082 100644 (file)
--- 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 c940dfcaffe34044f66351ddfd63b8aa1b01dcb6..18ea6efee7efa535efd181589a801297dab23932 100644 (file)
--- 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 a6b9613eb3d60c86830aebe11bceedf57760c84a..ab31707cdc08a276a693a4c5c7d431a6275367b8 100644 (file)
--- 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 7614b50b50def2297ad46880671677745334795a..d3638404a58bacfb3552ee9f3ef538e9c1759000 100644 (file)
--- 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 9140cbdbbfb51cc57643c1800c7a47b067053fc6..c136d67c8a08be01b2ea034e5000c1b87ae01b84 100644 (file)
--- 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 61aab664d32de74e499cf381dd682a0bbad7a1a4..d4f452b95ed450a920f492b333ed114954dcfa3e 100644 (file)
--- 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 459110a98741f43fac5610aa89b4145e694deea0..ffa4e68df826bf48d4ab0091b99a58d5206b3444 100644 (file)
--- 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 0d7ba818bbe1fc6d5aaf841c4435fa5be638f8c9..225e536657547214e7e48d97090ce025c06e4f53 100644 (file)
--- 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 9ffe8882333e895da1bb1b485b140f4d74a20ef5..d1304ce84cad6127c3781bae6e0cb3e1af1b1459 100644 (file)
--- 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 fb742910958f1a7374dfb85a6c983bd8db247bdf..a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a 100644 (file)
--- 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 5f6a18605624177f2a1a5389bdf9cad3913e327a..7aa142c7d4dd224d1743db149348ff92e13fe6aa 100644 (file)
--- 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 c3ec8c06c26dff468f58af280ba7169bfcd60e2f..67beac471e0279102fcccb337d3abc356e82c3c0 100644 (file)
--- 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 2b2d2f7000b0ccce7efd3523fa5ff027befda80e..de7f3e97234e4b8a859477450dc54ec60fa2d9a2 100644 (file)
--- 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 1910c3a659701021b9c14d97cfec5eed8b0209c0..4ccb11aea27992cfcc230538ecd3970cb0968e99 100644 (file)
--- 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 daf953b7fda89a60683a1c6c2f71051418ba3f72..c4bdaa014a9db5b18059ec48115808238347932b 100644 (file)
--- 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