X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=clients%2Ftools%2FMakefile.in;h=7685d1292e8bcf550544ad588a425f4322f8b082;hb=e87f588f00ddab6ea16aff3dcce7f3bc678f3f62;hp=3a315d970da0e814a00ec28ab5c6daebc13777be;hpb=8111fb612e52671e1f0bcb868e794695b5e18af6;p=openldap

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index 3a315d970d..7685d1292e 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -1,70 +1,85 @@
+# $OpenLDAP$
 ##
 ## Makefile for LDAP tools
 ##
-SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c
-OBJS	= ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o
-XLIBS	= -llber -lldap
+SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
+		ldappasswd.c ldapwhoami.c ldapcompare.c common.c
+OBJS	= ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o \
+		ldappasswd.o ldapwhoami.o ldapcompare.o common.o
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c
+MKVOPTS = -s
+
+XLIBS =  $(LDAP_LIBLDIF_A) $(LDAP_L)
+XXLIBS	= $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
+
+XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c \
+	ldpversion.c ldwversion.c ldcversion.c
+
+PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn \
+	ldappasswd ldapwhoami ldapcompare
 
-PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd
 
 ldapsearch:	ldsversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapsearch.o ldsversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapsearch.o common.o ldsversion.o $(LIBS)
 
 ldapmodify:	ldmversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapmodify.o ldmversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapmodify.o common.o ldmversion.o $(LIBS)
 
 ldapdelete:	lddversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapdelete.o lddversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapdelete.o common.o lddversion.o $(LIBS)
 
 ldapmodrdn:	ldrversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
-
-ldapadd:	ldapmodify
-	$(RM) $@
-	$(LN) ldapmodify ldapadd
-
-ldsversion.c: ldapsearch.o $(LDAP_LIBDEPEND)
-	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionlds.c > $@)
-
-ldmversion.c: ldapmodify.o $(LDAP_LIBDEPEND)
-	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionldm.c > $@)
-
-lddversion.c: ldapdelete.o $(LDAP_LIBDEPEND)
-	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionldd.c > $@)
-
-ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
-	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionldr.c > $@)
-
-install-local:	ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd FORCE
-	-$(MKDIR) -p $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
-	$(RM) $(bindir)/ldapadd
-	$(LN) $(bindir)/ldapmodify $(bindir)/ldapadd
+	$(LTLINK) -o $@ ldapmodrdn.o common.o ldrversion.o $(LIBS)
+
+ldappasswd:	ldpversion.o
+	$(LTLINK) -o $@ ldappasswd.o common.o ldpversion.o $(LIBS)
+
+ldapwhoami:	ldwversion.o
+	$(LTLINK) -o $@ ldapwhoami.o common.o ldwversion.o $(LIBS)
+
+ldapcompare: ldcversion.o
+	$(LTLINK) -o $@ ldapcompare.o common.o ldcversion.o $(LIBS)
+
+ldsversion.c: ldapsearch.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapsearch > $@
+
+ldmversion.c: ldapmodify.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapmodify > $@
+
+lddversion.c: ldapdelete.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapdelete > $@
+
+ldpversion.c: ldappasswd.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldappasswd > $@
+
+ldrversion.c: ldapmodrdn.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapmodrdn > $@
+
+ldwversion.c: ldapwhoami.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapwhoami > $@
+
+ldcversion.c: ldapcompare.o common.o $(XLIBS)
+	@-$(RM) $@
+	$(MKVERSION) $(MKVOPTS) ldapcompare > $@
+
+
+install-local:	FORCE
+	-$(MKDIR) $(DESTDIR)$(bindir)
+	@(								\
+	    for prg in $(PROGRAMS); do					\
+		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
+		    $(DESTDIR)$(bindir);				\
+	    done							\
+	)
+	$(RM) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/ldapmodify$(EXEEXT) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
+