X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2FMakefile.in;h=1282ffa1ef8fce6bca72ee7fea7151ee6f016755;hb=29f2fd4d20123f12080c8dcd7aa422b93cd56b94;hp=92f2303ec6fe5ce9feabbc2aab30cc56f72099b9;hpb=0552b1c53fa44790811f44cac5e14fc52fbd2ace;p=openldap

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index 92f2303ec6..1282ffa1ef 100644
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -1,41 +1,48 @@
+# 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_r.la
-XLIBRARY = ../libldap_r.a
 
-PROGRAMS = apitest ltest ttest
+PROGRAMS = apitest ltest
 
 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 cache.c cyrus.c \
-	getfilter.c sasl.c sbind.c kbind.c unbind.c \
-	free.c disptmpl.c srchpref.c dsparse.c tmplout.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 \
+	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
-SRCS	= threads.c rdwr.c tpool.c \
+	charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c
+SRCS	= threads.c rdwr.c tpool.c rq.c \
 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
 	thr_pth.c thr_stub.c
-OBJS	= threads.lo rdwr.lo tpool.lo  \
+OBJS	= threads.lo rdwr.lo tpool.lo  rq.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 \
-	free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.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 \
+	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
+	charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
@@ -43,12 +50,13 @@ 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 :
+.links : Makefile
 	@for i in $(XXSRCS); do \
 		$(RM) $$i ; \
 		$(LN_S) $(XXDIR)/$$i . ; \
@@ -62,14 +70,13 @@ 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)
-ttest:	$(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
-	$(LTLINK) -o $@ tmpltest.o $(LIBS)
 
 install-local: $(CFFILES) FORCE
 	-$(MKDIR) $(DESTDIR)$(libdir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+	$(LTFINISH) $(DESTDIR)$(libdir)