X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2FMakefile.in;h=db01326dbbc5d3c84c2bb0d5ac657a064ca560f6;hb=dc19332bb9db142c52b580e3f74a6c20d5c8ef23;hp=051b1ceb3a6e68e6a410e2a398b3c901e6253383;hpb=b3b17ca4e7cfb8035c2b91cb98f27952ba1026a8;p=openldap

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 051b1ceb3a..db01326dbb 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,56 +1,66 @@
+# Makefile.in for LDAP -lldap
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Makefile.in for LDAP -lldap
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
 LIBRARY = libldap.la
-XLIBRARY = ../libldap.a
 
-PROGRAMS = apitest ltest ttest dntest
+PROGRAMS = apitest dntest ftest ltest
 
 SRCS	= bind.c open.c result.c error.c compare.c search.c \
 	controls.c messages.c references.c extended.c cyrus.c \
-	modify.c add.c modrdn.c delete.c abandon.c cache.c \
-	getfilter.c sasl.c sbind.c kbind.c unbind.c \
-	free.c tmplout.c sort.c \
+	modify.c add.c modrdn.c delete.c abandon.c \
+	sasl.c sbind.c kbind.c unbind.c cancel.c  \
+	filter.c free.c sort.c passwd.c whoami.c \
 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
 	init.c options.c print.c string.c util-int.c schema.c \
-	charray.c tls.c dn.c os-local.c dnssrv.c \
-	utf-8.c utf-8-conv.c
+	charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c
 OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
-	modify.lo add.lo modrdn.lo delete.lo abandon.lo cache.lo \
-	getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo \
-	free.lo tmplout.lo sort.lo \
+	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
+	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
+	filter.lo free.lo sort.lo passwd.lo whoami.lo \
 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
-	charray.lo tls.lo dn.lo os-local.lo dnssrv.lo \
-	utf-8.lo utf-8-conv.lo
+	charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
 LIB_DEFS = -DLDAP_LIBRARY
 
-XLIBS = -lldap -llber -llutil
+XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
-NT_LINK_LIBS = -llber $(AC_LIBS) $(SECURITY_LIBS)
+NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
 
-apitest:	$(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+apitest:	$(XLIBS) apitest.o
 	$(LTLINK) -o $@ apitest.o $(LIBS)
-ltest:	$(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
-	$(LTLINK) -o $@ test.o $(LIBS)
-dntest:	$(LIBRARY) dntest.o $(LDAP_LIBLBER_DEPEND)
+dntest:	$(XLIBS) dntest.o
 	$(LTLINK) -o $@ dntest.o $(LIBS)
+ftest:	$(XLIBS) ftest.o
+	$(LTLINK) -o $@ ftest.o $(LIBS)
+ltest:	$(XLIBS) test.o
+	$(LTLINK) -o $@ test.o $(LIBS)
 
-CFFILES=ldap.conf ldapfilter.conf
+CFFILES=ldap.conf
 
 install-local: $(CFFILES) FORCE
 	-$(MKDIR) $(DESTDIR)$(libdir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+	$(LTFINISH) $(DESTDIR)$(libdir)
 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
 	@for i in $(CFFILES); do \
 		if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \