summaryrefslogtreecommitdiff
path: root/rpmdb/Makefile.am
diff options
context:
space:
mode:
authorRalf Corsépius <corsepiu@fedoraproject.org>2007-09-11 02:33:56 +0200
committerRalf Corsépius <corsepiu@fedoraproject.org>2007-09-11 02:33:56 +0200
commitb2578d6c8120114e0f2732317e06e9da5f3611fc (patch)
tree93c831c6b538c620bfeb28081eca94313d02f0ac /rpmdb/Makefile.am
parenteb33fb5100c6370c3ec4a5f86277c2422b84968c (diff)
downloadrpm-b2578d6c8120114e0f2732317e06e9da5f3611fc.tar.gz
rpm-b2578d6c8120114e0f2732317e06e9da5f3611fc.tar.bz2
rpm-b2578d6c8120114e0f2732317e06e9da5f3611fc.zip
Use _LDADD instead of _LDFLAGS.
Remove commented out _LDFLAGS.
Diffstat (limited to 'rpmdb/Makefile.am')
-rw-r--r--rpmdb/Makefile.am11
1 files changed, 4 insertions, 7 deletions
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