Remove commented out _LDFLAGS.
parseBuildInstallClean.c parseChangelog.c parseDescription.c \
parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
-librpmbuild_la_LDFLAGS = -release 4.4 \
+librpmbuild_la_LDFLAGS = -release 4.4
+librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \
rpmvercmp.c signature.c signature.h stringbuf.c transaction.c \
verify.c rpmlock.c rpmlock.h
-librpm_la_LDFLAGS = -release 4.4 \
+librpm_la_LDFLAGS = -release 4.4
+
+librpm_la_LIBADD = \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@WITH_BEECRYPT_LIB@ \
check_PROGRAMS += trb
trb_SOURCES = trb.c
-#trb_LDFLAGS = @LDFLAGS_STATIC@
trb_LDADD = librpm.la
check_PROGRAMS += tthread
tthread_SOURCES = tthread.c
-tthread_LDFLAGS =
tthread_LDADD = librpm.la @WITH_LIBELF_LIB@
check_PROGRAMS += tsystem
tsystem_SOURCES = tsystem.c
-tsystem_LDFLAGS =
tsystem_LDADD = ../rpmio/librpmio.la @WITH_POPT_LIB@
check_PROGRAMS += tcpu
tcpu_SOURCES = tcpu.c
-# tcpu_LDFLAGS = @LDFLAGS_STATIC@
tcpu_LDADD = librpm.la
check_PROGRAMS += tplatform
tplatform_SOURCES = tplatform.c
-# tplatform_LDFLAGS = @LDFLAGS_STATIC@
tplatform_LDADD = librpm.la
check_PROGRAMS += tgi
tgi_SOURCES = tgi.c
-# tgi_LDFLAGS = @LDFLAGS_STATIC@
tgi_LDADD = librpm.la
check_PROGRAMS += tufdio
tufdio_SOURCES = tufdio.c
-# tgi_LDFLAGS = @LDFLAGS_STATIC@
tufdio_LDADD = librpm.la
check_PROGRAMS += tjfn
tjfn_SOURCES = tjfn.c
-# tjfn_LDFLAGS = @LDFLAGS_STATIC@
tjfn_LDADD = librpmdb.la @WITH_BEECRYPT_LIB@
pkgincdir = $(pkgincludedir)
if SQLITE3
librpmdb_la_SOURCES += sqlite.c
endif
-librpmdb_la_LDFLAGS = -release 4.4 \
+librpmdb_la_LDFLAGS = -release 4.4
+librpmdb_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
@WITH_BEECRYPT_LIB@ \
@WITH_POPT_LIB@ \
@WITH_SQLITE3_LIB@ \
- @WITH_LIBELF_LIB@
-librpmdb_la_LIBADD = $(libdb_la)
-librpmdb_la_DEPENDENCIES = $(libdb_la)
+ @WITH_LIBELF_LIB@ \
+ $(libdb_la)
tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h
@echo '/*@-bounds@*/' > $@
check_PROGRAMS += tdbi
tdbi_SOURCES = tdbi.c
-# tdbi_LDFLAGS = @LDFLAGS_STATIC@
tdbi_LDADD = librpmdb.la
EXTRA_PROGRAMS += tsql
tsql_SOURCES = tsql.c
-# tsql_LDFLAGS = @LDFLAGS_STATIC@
tsql_LDADD = librpmdb.la
if LIBDWARF
rpmlibexec_PROGRAMS += debugedit
debugedit_SOURCES = debugedit.c hashtab.c hashtab.h
-# debugedit_LDFLAGS = $(staticLDFLAGS) \
-debugedit_LDFLAGS = @WITH_LIBELF_LIB@ \
+debugedit_LDADD = @WITH_LIBELF_LIB@ \
@WITH_BEECRYPT_LIB@ \
@WITH_POPT_LIB@
endif
rpmlibexec_PROGRAMS += rpmcache
rpmcache_SOURCES = rpmcache.c
-#rpmcache_LDFLAGS = -L$(libdir) # $(staticLDFLAGS)
rpmlibexec_PROGRAMS += rpmdeps
rpmdeps_SOURCES = rpmdeps.c
-#rpmdeps_LDFLAGS = $(staticLDFLAGS)
rpmdeps_LDADD = ../build/librpmbuild.la
bin_PROGRAMS = rpmgraph
rpmgraph_SOURCES = rpmgraph.c
-#rpmgraph_LDFLAGS = $(staticLDFLAGS)
check_PROGRAMS += rpminject
rpminject_SOURCES = rpminject.c
-#rpminject_LDFLAGS = $(staticLDFLAGS)
rpminject_LDADD = ../build/librpmbuild.la
check_PROGRAMS += rpmsort
rpmsort_SOURCES = rpmsort.c
-#rpmsort_LDFLAGS = $(staticLDFLAGS)
if LIBXML2
check_PROGRAMS += rpmtool
rpmtool_SOURCES = rpmtool.c rpmxp.c rpmxp.h
rpmtool_CPPFLAGS = $(AM_CPPFLAGS) $(libxml2_CFLAGS)
-#rpmtool_LDFLAGS = $(staticLDFLAGS)
rpmtool_LDADD = ../lib/librpm.la $(libxml2_LIBS)
check_PROGRAMS += rpmxml
rpmxml_SOURCES = rpmxml.c rpmxp.h
rpmxml_CPPFLAGS = $(AM_CPPFLAGS) $(libxml2_CFLAGS)
-#rpmxml_LDFLAGS = $(staticLDFLAGS)
rpmxml_LDADD = ../lib/librpm.la $(libxml2_LIBS)
endif