Import latest leak fix from HEAD.

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 0ae884ddb1da73139533edf2b2a3f6c373f8cf49..996f11046c29efe0f2a8b408d57de8992450f42a 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -10,9 +10,9 @@ XLIBRARY = ../libldap.a
 PROGRAMS = apitest ltest ttest
 
 SRCS   = bind.c open.c result.c error.c compare.c search.c \
-       controls.c messages.c references.c extended.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 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 os-ip.c url.c sortctrl.c vlvctrl.c \
@@ -20,9 +20,9 @@ SRCS  = bind.c open.c result.c error.c compare.c search.c \
        charray.c tls.c dn.c os-local.c dnssrv.c \
        utf-8.c
 OBJS   = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-       controls.lo messages.lo references.lo extended.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 cldap.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 \
@@ -39,8 +39,8 @@ XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
 LINKAGE = @LT_LIB_LINKAGE@
 
 NT_DYN_LIB_LIBS  = -llber -llutil $(AC_LIBS)
-NT_DYN_LIB_DEFS  = -DLIBLBER_DECL=dllimport
-NT_DYN_TEST_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+NT_DYN_LIB_DEFS  = -DLBER_DECL=dllimport
+NT_DYN_TEST_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
 
 NT_XXLIBS = $(SECURITY_LIBS)
 
@@ -55,11 +55,11 @@ EXTRA_LIBS = $(@PLAT@_@LIB_LINKAGE@_LIB_LIBS) $(@PLAT@_XXLIBS)
 CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
 
 apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
+       $(LTLINK) -o $@ apitest.o $(LIBS)
 ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
+       $(LTLINK) -o $@ test.o $(LIBS)
 ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
+       $(LTLINK) -o $@ tmpltest.o $(LIBS)
 
 CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf