diff options
| -rw-r--r-- | build/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 11 | ||||
| -rw-r--r-- | rpmdb/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/Makefile.am | 10 |
4 files changed, 10 insertions, 25 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index a5b36d439..b116b3154 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -21,7 +21,8 @@ librpmbuild_la_SOURCES = \ 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 \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 50150fab4..11e3aba05 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -33,7 +33,9 @@ librpm_la_SOURCES = \ 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@ \ @@ -78,35 +80,28 @@ tds_LDADD = librpm.la 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 diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index ebfd3ee83..9d2463643 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -19,7 +19,6 @@ check_PROGRAMS = check_PROGRAMS += tjfn tjfn_SOURCES = tjfn.c -# tjfn_LDFLAGS = @LDFLAGS_STATIC@ tjfn_LDADD = librpmdb.la @WITH_BEECRYPT_LIB@ pkgincdir = $(pkgincludedir) @@ -47,14 +46,14 @@ librpmdb_la_SOURCES += db3.c 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@*/' > $@ @@ -175,10 +174,8 @@ BUILT_SOURCES = tagtbl.c db.h 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 diff --git a/tools/Makefile.am b/tools/Makefile.am index ef55cad66..da9579bc5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -32,8 +32,7 @@ if LIBELF 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 @@ -44,36 +43,29 @@ javadeps_SOURCES = javadeps.c 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 |