StartTLS requires LDAPv3

[openldap] / clients / tools / Makefile.in

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index 806ea35f3bf3e615ab8068ef258e07d10b44cd7a..d9f3e60ac4a3d6a7368f7e40db6434fe2cc21058 100644 (file)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -1,15 +1,20 @@
+# $OpenLDAP$
 ##
 ## Makefile for LDAP tools
 ##
 SRCS   = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c ldappasswd.c
 OBJS   = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o ldappasswd.o
 
-XLIBS  = $(KRB_LIBS)
-
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XSRCS  = ldsversion.c ldmversion.c lddversion.c ldrversion.c
+NT_DYN_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS)
+
+XLIBS =  -llutil -lldif -lldap -llber
+XXLIBS = $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
+
+XSRCS  = ldsversion.c ldmversion.c lddversion.c ldrversion.c ldpversion.c
 
 PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd ldappasswd
 
@@ -25,51 +30,41 @@ ldapdelete: lddversion.o
 ldapmodrdn:    ldrversion.o
        $(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
 
-ldappasswd:    ldappasswd.o
-       $(LTLINK) -o $@ ldappasswd.o $(LIBS) @LUTIL_LIBS@ $(LDAP_LIBPATH) -llutil
+ldappasswd:    ldpversion.o
+       $(LTLINK) -o $@ ldappasswd.o ldpversion.o $(LIBS)
 
 ldapadd:       ldapmodify
-       $(RM) $@
-       $(LN) ldapmodify ldapadd
+       @-$(RM) $@$(EXEEXT)
+       $(LN_H) ldapmodify$(EXEEXT) ldapadd$(EXEEXT)
 
 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 > $@)
+       @-$(RM) $@
+       $(MKVERSION) ldapsearch > $@
 
 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 > $@)
+       @-$(RM) $@
+       $(MKVERSION) ldapmodify > $@
 
 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 > $@)
+       @-$(RM) $@
+       $(MKVERSION) ldapdelete > $@
+
+ldpversion.c: ldappasswd.o $(LDAP_LIBDEPEND)
+       @-$(RM) $@
+       $(MKVERSION) ldappasswd > $@
 
 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 > $@)
+       @-$(RM) $@
+       $(MKVERSION) ldapmodrdn > $@
 
 install-local: FORCE
-       -$(MKDIR) $(bindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldappasswd $(bindir)
-       $(RM) $(bindir)/ldapadd
-       $(LN) $(bindir)/ldapmodify $(bindir)/ldapadd
+       -$(MKDIR) $(DESTDIR)$(bindir)
+       @(                                                              \
+           for prg in $(PROGRAMS); do                                  \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT)      \
+                   $(DESTDIR)$(bindir);                                \
+           done                                                        \
+       )
+       $(RM) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
+       $(LN) $(DESTDIR)$(bindir)/ldapmodify$(EXEEXT) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT)
+