Use ol_version.h

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index 7685d1292e8bcf550544ad588a425f4322f8b082..eb009cc6b22de1b29f875f3001891ae8cf5362b7 100644 (file)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -22,55 +22,47 @@ PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn \
        ldappasswd ldapwhoami ldapcompare
 
 
-ldapsearch:    ldsversion.o
-       $(LTLINK) -o $@ ldapsearch.o common.o ldsversion.o $(LIBS)
+ldapsearch:    ldapsearch.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapsearch.o common.o $(LIBS)
 
-ldapmodify:    ldmversion.o
-       $(LTLINK) -o $@ ldapmodify.o common.o ldmversion.o $(LIBS)
+ldapmodify:    ldapmodify.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapmodify.o common.o $(LIBS)
 
-ldapdelete:    lddversion.o
-       $(LTLINK) -o $@ ldapdelete.o common.o lddversion.o $(LIBS)
+ldapdelete:    ldapdelete.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapdelete.o common.o $(LIBS)
 
-ldapmodrdn:    ldrversion.o
-       $(LTLINK) -o $@ ldapmodrdn.o common.o ldrversion.o $(LIBS)
+ldapmodrdn:    ldapmodrdn.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapmodrdn.o common.o $(LIBS)
 
-ldappasswd:    ldpversion.o
-       $(LTLINK) -o $@ ldappasswd.o common.o ldpversion.o $(LIBS)
+ldappasswd:    ldappasswd.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldappasswd.o common.o $(LIBS)
 
-ldapwhoami:    ldwversion.o
-       $(LTLINK) -o $@ ldapwhoami.o common.o ldwversion.o $(LIBS)
+ldapwhoami:    ldapwhoami.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapwhoami.o common.o $(LIBS)
 
-ldapcompare: ldcversion.o
-       $(LTLINK) -o $@ ldapcompare.o common.o ldcversion.o $(LIBS)
+ldapcompare: ldapcompare.o common.o $(XLIBS)
+       $(LTLINK) -o $@ ldapcompare.o common.o $(LIBS)
 
-ldsversion.c: ldapsearch.o common.o $(XLIBS)
-       @-$(RM) $@
-       $(MKVERSION) $(MKVOPTS) ldapsearch > $@
+ldapsearch.o:  $(srcdir)/ldapsearch.c
+       $(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
-ldmversion.c: ldapmodify.o common.o $(XLIBS)
-       @-$(RM) $@
-       $(MKVERSION) $(MKVOPTS) ldapmodify > $@
+ldapmodify.o:  $(srcdir)/ldapmodify.c
+       $(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
-lddversion.c: ldapdelete.o common.o $(XLIBS)
-       @-$(RM) $@
-       $(MKVERSION) $(MKVOPTS) ldapdelete > $@
+ldapdelete.o:  $(srcdir)/ldapdelete.c
+       $(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
-ldpversion.c: ldappasswd.o common.o $(XLIBS)
-       @-$(RM) $@
-       $(MKVERSION) $(MKVOPTS) ldappasswd > $@
+ldapmodrdn.o:  $(srcdir)/ldapmodrdn.c
+       $(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
-ldrversion.c: ldapmodrdn.o common.o $(XLIBS)
-       @-$(RM) $@
-       $(MKVERSION) $(MKVOPTS) ldapmodrdn > $@
+ldappasswd.o:  $(srcdir)/ldappasswd.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 > $@
+ldapwhoami.o:  $(srcdir)/ldapwhoami.c
+       $(CC) -c $(CFLAGS) $(CWD_DEF) -o $@ $<
 
+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 18ea6efee7efa535efd181589a801297dab23932..c940dfcaffe34044f66351ddfd63b8aa1b01dcb6 100644 (file)
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -35,6 +35,9 @@
 
 #include "common.h"
 
+#define _OLV_APP       "ldapcompare"
+#define        _OLV_STATIC
+#include "ol_version.h"
 
 static int quiet = 0;
 

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index d3638404a58bacfb3552ee9f3ef538e9c1759000..7614b50b50def2297ad46880671677745334795a 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -21,6 +21,10 @@
 
 #include "common.h"
 
+#define _OLV_APP       "ldapdelete"
+#define        _OLV_STATIC
+#include "ol_version.h"
+
 
 static int     prune = 0;
 

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index d4f452b95ed450a920f492b333ed114954dcfa3e..61aab664d32de74e499cf381dd682a0bbad7a1a4 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -36,6 +36,10 @@
 
 #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/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 225e536657547214e7e48d97090ce025c06e4f53..0d7ba818bbe1fc6d5aaf841c4435fa5be638f8c9 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -34,6 +34,10 @@
 
 #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/ldappasswd.c b/clients/tools/ldappasswd.c
index a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a..fb742910958f1a7374dfb85a6c983bd8db247bdf 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -23,6 +23,10 @@
 
 #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/ldapsearch.c b/clients/tools/ldapsearch.c
index 67beac471e0279102fcccb337d3abc356e82c3c0..c3ec8c06c26dff468f58af280ba7169bfcd60e2f 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -36,6 +36,10 @@
 
 #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/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 4ccb11aea27992cfcc230538ecd3970cb0968e99..1910c3a659701021b9c14d97cfec5eed8b0209c0 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -23,6 +23,10 @@
 
 #include "common.h"
 
+#define _OLV_APP       "ldapwhoami"
+#define        _OLV_STATIC
+#include "ol_version.h"
+
 
 void
 usage( void )