Added ldap_pvt_get_hname. Use instead of ldap_pvt_gethostbyaddr_a when

[openldap] / clients / tools / Makefile.in

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index 9366d2f80bddded3420931ccd6eef8beb3e0ffc1..7685d1292e8bcf550544ad588a425f4322f8b082 100644 (file)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -1,64 +1,85 @@
+# $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
+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
 
-XLIBS =  -lldif -lldap -llber -llutil
-XXLIBS = $(KRB_LIBS) $(LUTIL_LIBS)
+MKVOPTS = -s
 
-XSRCS  = ldsversion.c ldmversion.c lddversion.c ldrversion.c
+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 ldappasswd
 
 ldapsearch:    ldsversion.o
-       $(LTLINK) -o $@ ldapsearch.o ldsversion.o $(LIBS)
+       $(LTLINK) -o $@ ldapsearch.o common.o ldsversion.o $(LIBS)
 
 ldapmodify:    ldmversion.o
-       $(LTLINK) -o $@ ldapmodify.o ldmversion.o $(LIBS)
+       $(LTLINK) -o $@ ldapmodify.o common.o ldmversion.o $(LIBS)
 
 ldapdelete:    lddversion.o
-       $(LTLINK) -o $@ ldapdelete.o lddversion.o $(LIBS)
+       $(LTLINK) -o $@ ldapdelete.o common.o lddversion.o $(LIBS)
 
 ldapmodrdn:    ldrversion.o
-       $(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
+       $(LTLINK) -o $@ ldapmodrdn.o common.o ldrversion.o $(LIBS)
 
 ldappasswd:    ldpversion.o
-       $(LTLINK) -o $@ ldappasswd.o ldpversion.o $(LIBS)
+       $(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)
 
-ldapadd:       ldapmodify
+ldsversion.c: ldapsearch.o common.o $(XLIBS)
        @-$(RM) $@
-       $(LN_H) ldapmodify$(EXEEXT) ldapadd$(EXEEXT)
+       $(MKVERSION) $(MKVOPTS) ldapsearch > $@
 
-ldsversion.c: ldapsearch.o $(LDAP_LIBDEPEND)
+ldmversion.c: ldapmodify.o common.o $(XLIBS)
        @-$(RM) $@
-       $(MKVERSION) ldapsearch > $@
+       $(MKVERSION) $(MKVOPTS) ldapmodify > $@
 
-ldmversion.c: ldapmodify.o $(LDAP_LIBDEPEND)
+lddversion.c: ldapdelete.o common.o $(XLIBS)
        @-$(RM) $@
-       $(MKVERSION) ldapmodify > $@
+       $(MKVERSION) $(MKVOPTS) ldapdelete > $@
 
-lddversion.c: ldapdelete.o $(LDAP_LIBDEPEND)
+ldpversion.c: ldappasswd.o common.o $(XLIBS)
        @-$(RM) $@
-       $(MKVERSION) ldapdelete > $@
+       $(MKVERSION) $(MKVOPTS) ldappasswd > $@
 
-ldpversion.c: ldappasswd.o $(LDAP_LIBDEPEND)
+ldrversion.c: ldapmodrdn.o common.o $(XLIBS)
        @-$(RM) $@
-       $(MKVERSION) ldappasswd > $@
+       $(MKVERSION) $(MKVOPTS) ldapmodrdn > $@
 
-ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
+ldwversion.c: ldapwhoami.o common.o $(XLIBS)
        @-$(RM) $@
-       $(MKVERSION) ldapmodrdn > $@
+       $(MKVERSION) $(MKVOPTS) ldapwhoami > $@
+
+ldcversion.c: ldapcompare.o common.o $(XLIBS)
+       @-$(RM) $@
+       $(MKVERSION) $(MKVOPTS) ldapcompare > $@
+
 
 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$(EXEEXT)
-       $(LN) $(bindir)/ldapmodify$(EXEEXT) $(bindir)/ldapadd$(EXEEXT)
+       -$(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)
+