X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2FMakefile.in;h=731d3adb15e2d6e0fa0026284b62f4baff81216e;hb=e2cca72bdc02a1d4bbf75ec2c98b9105e425a558;hp=d18c4e0a9f1a8d195bfb545b32539ea3cebf4c32;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index d18c4e0a9f..731d3adb15 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,45 +1,83 @@
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## Makefile.in for LDAP -lldap
 ##
-LIBRARY = libldap.a
-PROGRAMS = ltest ttest
-
-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries
+LIBRARY = libldap.la
+XLIBRARY = ../libldap.a
 
+PROGRAMS = apitest ltest ttest
 
 SRCS	= bind.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 \
+	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 friendly.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
-OBJS	= bind.o open.o result.o error.o compare.o search.o \
-	modify.o add.o modrdn.o delete.o abandon.o ufn.o cache.o \
-	getfilter.o sbind.o kbind.o unbind.o friendly.o cldap.o \
-	free.o disptmpl.o srchpref.o dsparse.o tmplout.o sort.o \
-	getdn.o getentry.o getattr.o getvalues.o addentry.o \
-	request.o getdxbyname.o os-ip.o url.o charset.o
-
-LIBS = -L$(LDAP_LIBDIR) -lldap -llber $(AC_LIBS)
-LIBLBER = ../liblber/liblber.a
-
-ltest:	$(LIBRARY) test.o $(LIBLBER)
-	$(CC) $(LDFLAGS) -o $@ test.o $(LIBS)
-ttest:	$(LIBRARY) tmpltest.o $(LIBLBER)
-	$(CC) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
-
-CFFILES= ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf
-
-install-local: $(LIBRARY) $(CFFILES) FORCE
-	-$(MKDIR) -p $(libdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-	@(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))
-	-$(MKDIR) -p $(sysconfdir)
+	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
+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 friendly.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 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
+
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
+XLIBS = -lldap -llber -llutil
+XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
+
+LINKAGE = @LT_LIB_LINKAGE@
+
+NT_DYN_LIB_LIBS  = -llber -llutil $(AC_LIBS)
+NT_DYN_LIB_DEFS  = -DLBER_DECL=dllimport
+NT_DYN_TEST_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
+
+NT_XXLIBS = $(SECURITY_LIBS)
+
+UNIX_DYN_LIB_LIBS  = -llber $(AC_LIBS)
+UNIX_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)
+
+apitest:	$(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) -o $@ apitest.o $(LIBS)
+ltest:	$(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) -o $@ test.o $(LIBS)
+ttest:	$(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) -o $@ tmpltest.o $(LIBS)
+
+CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
+
+install-local: $(CFFILES) FORCE
+	-$(MKDIR) $(DESTDIR)$(libdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+	-$(MKDIR) $(DESTDIR)$(sysconfdir)
 	@for i in $(CFFILES); do \
-		echo "installing $$i in $(sysconfdir)"; \
-		if test -f $(sysconfdir)/$$i; then \
-			$(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i-; \
+		if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+			echo "installing $$i in $(sysconfdir)"; \
+			echo "$(INSTALL) $(INSTALLFLAGS) -m 644  $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+			$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
+		else \
+			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
-		$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \
+		$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
 	done
+	-$(MKDIR) $(DESTDIR)$(datadir)
+	-$(MV) $(DESTDIR)$(datadir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly-
+	$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly
+