X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2FMakefile.in;h=d9f3e60ac4a3d6a7368f7e40db6434fe2cc21058;hb=4ecf780e48f3f73a62c8e61360d5b5e0548b3173;hp=f41c17620e173ca23ebdad904a5e8e2e4bbe7f28;hpb=dba57a312c77841b3940fc1a20cc52cc629afe0f;p=openldap

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index f41c17620e..d9f3e60ac4 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ##
 ## Makefile for LDAP tools
 ##
@@ -7,10 +8,13 @@ OBJS	= ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o ldappasswd.o
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldif -lldap -llber -llutil
-XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
+NT_DYN_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS)
 
-XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c
+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
 
@@ -30,8 +34,8 @@ ldappasswd:	ldpversion.o
 	$(LTLINK) -o $@ ldappasswd.o ldpversion.o $(LIBS)
 
 ldapadd:	ldapmodify
-	@-$(RM) $@
-	$(LN_H) ldapmodify ldapadd
+	@-$(RM) $@$(EXEEXT)
+	$(LN_H) ldapmodify$(EXEEXT) ldapadd$(EXEEXT)
 
 ldsversion.c: ldapsearch.o $(LDAP_LIBDEPEND)
 	@-$(RM) $@
@@ -54,11 +58,13 @@ ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
 	$(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)
+