X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2FMakefile.in;h=df89183eb27da648d63607d97d341076d58dfbbb;hb=e4f2c9425afc0f594212aa1697bad779733b96b9;hp=f32ec13117ccea027dc0505aaabd35540c3f6b6d;hpb=80649933bdd912ad20f04bcd0cede3e1f4048ae6;p=openldap

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index f32ec13117..df89183eb2 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,50 +1,49 @@
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## Makefile.in for LDAP -lldap
 ##
 LIBRARY = libldap.la
-XLIBRARY = ../libldap.a
 
-PROGRAMS = apitest ltest 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 dsparse.c sort.c \
+	filter.c free.c dsparse.c sort.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 dsparse.lo sort.lo \
+	filter.lo free.lo dsparse.lo sort.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)
 
-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