From 003a293e2b0727b4719744ac6efe58f561d1ec6d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 1 Oct 2000 08:10:37 +0000 Subject: [PATCH] Don't specify LDFLAGS when using LTLINK to avoid duplicate specfication of flags. --- libraries/libavl/Makefile.in | 2 +- libraries/liblber/Makefile.in | 6 +++--- libraries/libldap/Makefile.in | 6 +++--- libraries/libldap_r/Makefile.in | 6 +++--- libraries/libldbm/Makefile.in | 4 ---- libraries/liblunicode/Makefile.in | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in index e641c50c31..0ccaefee7c 100644 --- 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 c43adbd9f0..4180432c88 100644 --- 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 514558152d..2be2d6f925 100644 --- 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 68b18095b8..82321679c5 100644 --- 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 b5885fca00..df24629c01 100644 --- 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 55413c54f5..c9b8e11e4f 100644 --- 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 -- 2.39.5