diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2011-02-01 02:41:27 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-02-01 02:51:54 +0100 |
| commit | bf85255e1c813ef208eee77079f14eb5ebe766de (patch) | |
| tree | 7a74599e116ea53cf6a40bf31cb516b08e549682 /output | |
| parent | 6c21436c119cd7ba053937229aeb09dfd25925c2 (diff) | |
build: avoid use of LIBS variable
The variable contains global libraries linked into every possible
object, which is unwanted. Clean up things.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'output')
| -rw-r--r-- | output/Makefile.am | 1 | ||||
| -rw-r--r-- | output/dbi/Makefile.am | 2 | ||||
| -rw-r--r-- | output/mysql/Makefile.am | 2 | ||||
| -rw-r--r-- | output/pcap/Makefile.am | 2 | ||||
| -rw-r--r-- | output/pgsql/Makefile.am | 2 | ||||
| -rw-r--r-- | output/sqlite3/Makefile.am | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/output/Makefile.am b/output/Makefile.am index 34ffb2d..9d9ac73 100644 --- a/output/Makefile.am +++ b/output/Makefile.am @@ -1,6 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} -LIBS="" SUBDIRS= pcap mysql pgsql sqlite3 dbi diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am index 1ee8f2a..f413cab 100644 --- a/output/dbi/Makefile.am +++ b/output/dbi/Makefile.am @@ -1,13 +1,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC) AM_CFLAGS = ${regular_CFLAGS} -LIBS=$(DBI_LIB) if HAVE_DBI pkglib_LTLIBRARIES = ulogd_output_DBI.la ulogd_output_DBI_la_SOURCES = ulogd_output_DBI.c ../../util/db.c +ulogd_output_DBI_la_LIBADD = ${DBI_LIB} ulogd_output_DBI_la_LDFLAGS = -avoid-version -module endif diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am index a98cdeb..c24208c 100644 --- a/output/mysql/Makefile.am +++ b/output/mysql/Makefile.am @@ -1,12 +1,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC) AM_CFLAGS = ${regular_CFLAGS} -LIBS=$(MYSQL_LIB) if HAVE_MYSQL pkglib_LTLIBRARIES = ulogd_output_MYSQL.la ulogd_output_MYSQL_la_SOURCES = ulogd_output_MYSQL.c ../../util/db.c +ulogd_output_MYSQL_la_LIBADD = ${MYSQL_LIB} ulogd_output_MYSQL_la_LDFLAGS = -avoid-version -module endif diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am index 59cb3f6..47580d2 100644 --- a/output/pcap/Makefile.am +++ b/output/pcap/Makefile.am @@ -1,13 +1,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC) AM_CFLAGS = ${regular_CFLAGS} -LIBS=$(PCAP_LIB) if HAVE_PCAP pkglib_LTLIBRARIES = ulogd_output_PCAP.la ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c +ulogd_output_PCAP_la_LIBADD = ${PCAP_LIB} ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module endif diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am index 32be79b..bdaf1d2 100644 --- a/output/pgsql/Makefile.am +++ b/output/pgsql/Makefile.am @@ -1,13 +1,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH) AM_CFLAGS = ${regular_CFLAGS} -LIBS=$(PQLIBS) if HAVE_PGSQL pkglib_LTLIBRARIES = ulogd_output_PGSQL.la ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c +ulogd_output_PGSQL_la_LIBADD = ${PQLIBS} ulogd_output_PGSQL_la_LDFLAGS = -avoid-version -module endif diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am index d14398c..3bfec2e 100644 --- a/output/sqlite3/Makefile.am +++ b/output/sqlite3/Makefile.am @@ -1,12 +1,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC) AM_CFLAGS = ${regular_CFLAGS} -LIBS=$(SQLITE3_LIB) if HAVE_SQLITE3 pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c +ulogd_output_SQLITE3_la_LIBADD = ${SQLITE3_LIBS} ulogd_output_SQLITE3_la_LDFLAGS = -avoid-version -module endif |