X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2FMakefile.in;h=484b8f6591666fe754d60a17885ecdadcfa4086e;hb=c1a257a83f3d8b9565238b5f9b8cad39a6194f63;hp=2be2d6f9256bb448c56081d46641f1e26bdb66fb;hpb=003a293e2b0727b4719744ac6efe58f561d1ec6d;p=openldap

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 2be2d6f925..484b8f6591 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -7,52 +7,37 @@
 LIBRARY = libldap.la
 XLIBRARY = ../libldap.a
 
-PROGRAMS = apitest ltest ttest
+PROGRAMS = apitest ltest ttest dntest
 
 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 ufn.c cache.c \
-	getfilter.c sasl.c sbind.c kbind.c unbind.c friendly.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 disptmpl.c srchpref.c dsparse.c tmplout.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 \
 	charray.c tls.c dn.c os-local.c dnssrv.c \
-	utf-8.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 ufn.lo cache.lo \
-	getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo friendly.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 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.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)
+LIB_DEFS = -DLDAP_LIBRARY
 
-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)
+XLIBS = -lldap -llber -llutil
+XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+NT_LINK_LIBS = -llber $(AC_LIBS) $(SECURITY_LIBS)
 
 apitest:	$(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
 	$(LTLINK) -o $@ apitest.o $(LIBS)
@@ -60,6 +45,8 @@ ltest:	$(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
 	$(LTLINK) -o $@ test.o $(LIBS)
 ttest:	$(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
 	$(LTLINK) -o $@ tmpltest.o $(LIBS)
+dntest:	$(LIBRARY) dntest.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) -o $@ dntest.o $(LIBS)
 
 CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
 
@@ -77,7 +64,4 @@ install-local: $(CFFILES) FORCE
 		fi; \
 		$(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