Patch: More format bugs (ITS#1702)

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index a8a34954137b9ae142ea434b9ad80fd385ef99ec..df89183eb27da648d63607d97d341076d58dfbbb 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,11 +1,10 @@
 # $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 dntest ftest ltest
 
@@ -13,7 +12,7 @@ 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 \
@@ -22,7 +21,7 @@ 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 \
@@ -33,17 +32,17 @@ 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)
-dntest:        $(LIBRARY) dntest.o $(LDAP_LIBLBER_DEPEND)
+dntest:        $(XLIBS) dntest.o
        $(LTLINK) -o $@ dntest.o $(LIBS)
-ftest: $(LIBRARY) ftest.o $(LDAP_LIBLBER_DEPEND)
+ftest: $(XLIBS) ftest.o
        $(LTLINK) -o $@ ftest.o $(LIBS)
-ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+ltest: $(XLIBS) test.o
        $(LTLINK) -o $@ test.o $(LIBS)
 
 CFFILES=ldap.conf ldapfilter.conf