Eliminate second session protocol version field.

[openldap] / libraries / libldap_r / Makefile.in

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index e8d5f69b0ebe841027390d50204b79e54681b888..beddcf0f039000140aac874f0e1c639510d9532e 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ##
 ## Makefile.in for LDAP -lldap
 ##
@@ -6,30 +7,56 @@ XLIBRARY = ../libldap_r.a
 
 PROGRAMS = apitest ltest ttest
 
-XXDIR = ../libldap
-XXSRCS = apitest.c test.c tmpltest.c \
+XXDIR = $(srcdir)/../libldap
+XXSRCS = apitest.c test.c tmpltest.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 ufn.c cache.c \
-       getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
+       getfilter.c sasl.c sbind.c kbind.c unbind.c friendly.c cldap.c \
        free.c disptmpl.c srchpref.c dsparse.c tmplout.c sort.c \
        getdn.c getentry.c getattr.c getvalues.c addentry.c \
        request.c getdxbyname.c os-ip.c url.c charset.c \
-       init.c options.c strdup.c util-int.c
-OBJS   = bind.lo controls.lo open.lo result.lo error.lo compare.lo search.lo \
+       init.c options.c print.c string.c util-int.c schema.c \
+       charray.c digest.c tls.c dn.c os-local.c dnssrv.c \
+       utf-8.c
+SRCS   = thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+       thr_pth.c thr_sleep.c thr_stub.c rdwr.c
+OBJS   = 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 ufn.lo cache.lo \
-       getfilter.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
+       getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
        free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.lo sort.lo \
        getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
        request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
-       init.lo options.lo strdup.lo util-int.lo
+       init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+       thr_posix.lo thr_cthreads.lo thr_thr.lo thr_lwp.lo thr_nt.lo \
+       thr_pth.lo thr_sleep.lo thr_stub.lo rdwr.lo \
+       charray.lo digest.lo tls.lo dn.lo os-local.lo dnssrv.lo \
+       utf-8.lo
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
 XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
-LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
+XLIBS = -lldap_r -llber -llutil
+XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
 
-.links : FORCE
+LINKAGE = @LT_LIB_LINKAGE@
+
+NT_DYN_LIB_LIBS  = -llber $(AC_LIBS)
+NT_DYN_LIB_DEFS  = -DLIBLBER_DECL=dllimport
+NT_DYN_TEST_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+
+NT_XXLIBS = $(SECURITY_LIBS)
+
+# Extras for building the library
+EXTRA_DEFS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
+EXTRA_LIBS = $(@PLAT@_@LIB_LINKAGE@_LIB_LIBS) $(@PLAT@_XXLIBS)
+
+# Only the test programs will pick up these defs.
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
+
+.links :
        @for i in $(XXSRCS); do \
                $(RM) $$i ; \
                $(LN_S) $(XXDIR)/$$i . ; \
@@ -50,23 +77,6 @@ ltest:       $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
 ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
        $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
 
-CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
-
 install-local: $(CFFILES) FORCE
-       -$(MKDIR) $(libdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-       -$(MKDIR) $(sysconfdir)
-       @for i in $(CFFILES); do \
-               if test ! -f $(sysconfdir)/$$i; then \
-                       echo "installing $$i in $(sysconfdir)"; \
-                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \
-               else \
-                       echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
-               fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \
-       done
-       -$(MKDIR) $(datadir)
-       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly
-
+       -$(MKDIR) $(DESTDIR)$(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)