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>

diff --git a/configure.ac b/configure.ac
index 75372fc0d6a4b1f605072e68821d1ef71b818a40..1b799feb134f2824c55f80365f5272435cee5402 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,8 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
-AC_CHECK_LIB(dl, dlopen)
+AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
+AC_SUBST([libdl_LIBS])
 AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true)
 
 dnl Checks for header files.

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 7fd8979e3c8c753bce1bc2379e370c68e8bc196b..2e972f8a56cb1b0047c0d81b32077a178708812f 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,7 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
-LIBS=
 
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la
 

diff --git a/output/Makefile.am b/output/Makefile.am
index 34ffb2d2242f57df77d9115549ad19803cca7d8e..9d9ac73447868a496af10ff01e6bcf5a6b48d9b1 100644 (file)
--- 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 1ee8f2aed01816cd4654845e82a692f0cc808473..f413cab4a3405398d8386f5f895bc004bc05d8c6 100644 (file)
--- 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 a98cdebdab5e2877d84b831dab381cf8c20f6b66..c24208c3e3026ae96e75226c02a2ad1cfe014866 100644 (file)
--- 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 59cb3f62b8f003392ba74865c7166300cd4690be..47580d2d899ced74ef7f0ffb5a091c39a3886035 100644 (file)
--- 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 32be79b19ef4755c5173343dca7e4fda9faf0948..bdaf1d249dce04f2e16919b9170e79cc556b60dc 100644 (file)
--- 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 d14398c053db36dc49b3c86dad2e7acdcc730af3..3bfec2eda14c70a9c883b4984e3870e27a24d355 100644 (file)
--- 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

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ae78846e080dc77f687b479fe58e44e982d34c9..115ddd536b42a2505964ba66cba51bfe7ead6bcf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,4 +7,5 @@ AM_CFLAGS = ${regular_CFLAGS}
 sbin_PROGRAMS = ulogd
 
 ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c
+ulogd_LDADD   = ${libdl_LIBS}
 ulogd_LDFLAGS = -export-dynamic