From 36a017415e68fcfac22c9395f46f51d5e5445031 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Thu, 16 Aug 2007 05:58:28 +0200
Subject: [PATCH] Eliminate myLDADD.

---
 Makefile.am | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6f83945..800dc82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,14 +27,6 @@ staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
 
 myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
 
-myLDADD = \
-	lib/librpm.la \
-	rpmdb/librpmdb.la \
-	rpmio/librpmio.la \
-	@WITH_POPT_LIB@ \
-	@WITH_ZLIB_LIB@ \
-	@LIBMISC@
-
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
 
@@ -52,38 +44,38 @@ rpmpopt-$(VERSION): rpmpopt
 rpm_SOURCES =		rpmqv.c debug.h system.h
 rpm_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
 rpm_LDFLAGS =		$(myLDFLAGS)
-rpm_LDADD =		build/.libs/librpmbuild.a $(myLDADD)
+rpm_LDADD =		build/.libs/librpmbuild.a lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpmb_SOURCES =		build.c rpmqv.c build.h debug.h system.h
 rpmb_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMBT
 rpmb_LDFLAGS =		$(myLDFLAGS)
-rpmb_LDADD =		build/librpmbuild.la $(myLDADD)
+rpmb_LDADD =		build/librpmbuild.la lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpmd_SOURCES =		rpmqv.c debug.h system.h
 rpmd_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMDB
 rpmd_LDFLAGS =		$(myLDFLAGS)
-rpmd_LDADD =		$(myLDADD)
+rpmd_LDADD =		lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpmi_SOURCES =		rpmqv.c debug.h system.h
 rpmi_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMEIU
 #rpmi_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
-#rpmi_LDADD =		rpmi.o $(myLDADD) @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+#rpmi_LDADD =		rpmi.o lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@ @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
 rpmi_LDFLAGS =		$(myLDFLAGS)
-rpmi_LDADD =		$(myLDADD)
+rpmi_LDADD =		lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpmk_SOURCES =		rpmqv.c debug.h system.h
 rpmk_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMK
 rpmk_LDFLAGS =		$(myLDFLAGS)
-rpmk_LDADD =		$(myLDADD)
+rpmk_LDADD =		lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpmq_SOURCES =		rpmqv.c debug.h system.h
 rpmq_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMQV
 rpmq_LDFLAGS =		$(myLDFLAGS)
-rpmq_LDADD =		build/librpmbuild.la $(myLDADD)
+rpmq_LDADD =		build/librpmbuild.la lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@
 
 rpm2cpio_SOURCES =	rpm2cpio.c debug.h system.h
 rpm2cpio_LDFLAGS =	$(myLDFLAGS)
-rpm2cpio_LDADD =	$(myLDADD) @LIBMISC@
+rpm2cpio_LDADD =	lib/librpm.la rpmdb/librpmdb.la rpmio/librpmio.la @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @LIBMISC@ @LIBMISC@
 
 .PHONY:	splint
 splint:
-- 
2.7.4