search on 'userid' not 'uid'

[openldap] / libraries / libldap_r / Makefile.in

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index 87778cbde2e53d027b7cde760a2c3f0615db577f..fdb8a8d3092b9f00de869cc58526d8b49a7c8774 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -5,16 +5,16 @@
 ## Makefile.in for LDAP -lldap
 ##
 LIBRARY = libldap_r.la
-XLIBRARY = ../libldap_r.a
 
 PROGRAMS = apitest ltest
 
 XXDIR = $(srcdir)/../libldap
-XXSRCS = apitest.c test.c extended.c \
-       bind.c controls.c open.c result.c error.c compare.c search.c \
-       modify.c add.c modrdn.c delete.c abandon.c cache.c cyrus.c \
-       getfilter.c sasl.c sbind.c kbind.c unbind.c \
-       filter.c free.c dsparse.c sort.c \
+XXSRCS    = apitest.c test.c \
+       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 \
+       sasl.c sbind.c kbind.c unbind.c \
+       filter.c free.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 \
@@ -25,11 +25,11 @@ SRCS        = threads.c rdwr.c tpool.c \
 OBJS   = threads.lo rdwr.lo tpool.lo  \
        thr_posix.lo thr_cthreads.lo thr_thr.lo thr_lwp.lo thr_nt.lo \
        thr_pth.lo thr_stub.lo \
-       extended.lo \
-       bind.lo controls.lo open.lo result.lo error.lo compare.lo search.lo \
-       modify.lo add.lo modrdn.lo delete.lo abandon.lo cache.lo cyrus.lo \
-       getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo \
-       filter.lo free.lo dsparse.lo sort.lo \
+       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 \
+       sasl.lo sbind.lo kbind.lo unbind.lo \
+       filter.lo free.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 \
@@ -41,10 +41,11 @@ LDAP_LIBDIR= ../../libraries
 LIB_DEFS = -DLDAP_LIBRARY
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
-XLIBS = -lldap_r -llber -llutil
+XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_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)
 
 .links : Makefile
        @for i in $(XXSRCS); do \
@@ -60,9 +61,9 @@ clean-local: FORCE
 
 depend-common: .links
 
-apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+apitest:       $(XLIBS) apitest.o
        $(LTLINK) -o $@ apitest.o $(LIBS)
-ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+ltest: $(XLIBS) test.o
        $(LTLINK) -o $@ test.o $(LIBS)
 
 install-local: $(CFFILES) FORCE