Don't specify LDFLAGS when using LTLINK to avoid duplicate

specfication of flags.

diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in
index e641c50c319bef3fd5cd9d676b828b5e5d95b12a..0ccaefee7cff9e9a0ccf99c7704f86422d2f5c71 100644 (file)
--- a/libraries/libavl/Makefile.in
+++ b/libraries/libavl/Makefile.in
@@ -17,4 +17,4 @@ PROGRAMS      = testavl
 XLIBS = -lavl
 
 testavl:       $(LIBRARY) testavl.o
-       $(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LIBS)
+       $(LTLINK) -o $@ testavl.o $(LIBS)

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index c43adbd9f092afd298e3fa8c3d4910a7b0bb326c..4180432c88464403bd3953631fd21887c41678e7 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -37,11 +37,11 @@ EXTRA_LIBS =
 CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
 
 dtest:    $(LIBRARY) dtest.o
-       $(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
+       $(LTLINK) -o $@ dtest.o $(LIBS)
 etest:  $(LIBRARY) etest.o
-       $(LTLINK) $(LDFLAGS) -o $@ etest.o $(LIBS)
+       $(LTLINK) -o $@ etest.o $(LIBS)
 idtest:  $(LIBRARY) idtest.o
-       $(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
+       $(LTLINK) -o $@ idtest.o $(LIBS)
 
 install-local: FORCE
        -$(MKDIR) $(DESTDIR)$(libdir)

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 514558152d608ba4ff97973ba16b08154331ac51..2be2d6f9256bb448c56081d46641f1e26bdb66fb 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -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
 

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index 68b18095b8a7c7e23a2475f0769f4bb49349a55d..82321679c5f2b81cbf1b70eb2cac4d39bd92d73a 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/libraries/libldap_r/Makefile.in
@@ -78,11 +78,11 @@ clean-local: FORCE
 depend-common: .links
 
 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)
 
 install-local: $(CFFILES) FORCE
        -$(MKDIR) $(DESTDIR)$(libdir)

diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in
index b5885fca00b40d1c7a1f3b35a524c3d6a300913b..df24629c01cd4cb7824f38da2bd1edd28703b9b9 100644 (file)
--- a/libraries/libldbm/Makefile.in
+++ b/libraries/libldbm/Makefile.in
@@ -6,7 +6,6 @@
 ##
 
 LIBRARY                = libldbm.a
-XPROGRAMS      = testldbm
 SRCS           = ldbm.c
 OBJS           = ldbm.o
 
@@ -19,6 +18,3 @@ CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
 XLIBS          = -lldbm -lavl
 XXLIBS         = $(LDBM_LIBS)
 
-testldbm:      libldbm.a testldbm.o
-       $(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)
-

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index 55413c54f501a8a66dd2bc51fe3ec97cbbb4e3c6..c9b8e11e4f9e3c5b83452d3f3f055d6043d69b74 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -20,7 +20,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 ucgendat: $(LIBRARY) ucgendat.o
-       $(LTLINK) $(LDFLAGS) -o $@ ucgendat.o $(LIBS)
+       $(LTLINK) -o $@ ucgendat.o $(LIBS)
        ./ucgendat $(srcdir)/UnicodeData.txt
 
 DATFILES = case.dat cmbcl.dat ctype.dat decomp.dat num.dat