From 5dc52c43c4d9e0e8a6813cdcd8e1d12a9f1e3fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20L=C3=A4ssig?= Date: Sat, 10 Mar 2012 14:34:42 +0000 Subject: build: use pkglibdir instead of pkglibexecdir for automake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the following problem while running `autoreconf -fi` `pkglibexecdir' is not a legitimate directory for `LTLIBRARIES' variable `ulogd_filter_PRINTPKT_la_SOURCES' is defined but no program or library has `ulogd_filter_PRINTPKT_la' as canonical name (possible typo) Signed-off-by: Björn Lässig Signed-off-by: Pablo Neira Ayuso --- Makefile.am | 2 +- filter/Makefile.am | 2 +- filter/raw2packet/Makefile.am | 2 +- input/flow/Makefile.am | 2 +- input/packet/Makefile.am | 2 +- input/sum/Makefile.am | 2 +- output/Makefile.am | 2 +- output/dbi/Makefile.am | 2 +- output/mysql/Makefile.am | 2 +- output/pcap/Makefile.am | 2 +- output/pgsql/Makefile.am | 2 +- output/sqlite3/Makefile.am | 2 +- ulogd.conf.in | 48 +++++++++++++++++++++---------------------- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index 35e0338..bac839a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = include libipulog src input filter output noinst_DATA = ulogd.conf edit = sed \ - -e 's,@pkglibexecdir\@,${pkglibexecdir},g' + -e 's,@pkglibdir\@,${pkglibdir},g' ulogd.conf: Makefile $(srcdir)/ulogd.conf.in $(edit) $(srcdir)/ulogd.conf.in >ulogd.conf diff --git a/filter/Makefile.am b/filter/Makefile.am index 05f1247..5af0696 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = raw2packet packet2flow AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS} -pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \ +pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \ ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \ ulogd_filter_IP2STR.la ulogd_filter_IP2BIN.la \ ulogd_filter_HWHDR.la ulogd_filter_MARK.la \ diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am index a39f3ae..7498f9a 100644 --- a/filter/raw2packet/Makefile.am +++ b/filter/raw2packet/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} -pkglibexec_LTLIBRARIES = ulogd_raw2packet_BASE.la +pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la ulogd_raw2packet_BASE_la_SOURCES = ulogd_raw2packet_BASE.c ulogd_raw2packet_BASE_la_LDFLAGS = -avoid-version -module diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am index eaa1644..127caf6 100644 --- a/input/flow/Makefile.am +++ b/input/flow/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} -pkglibexec_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la +pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c ulogd_inpflow_NFCT_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am index d4ca449..250543b 100644 --- a/input/packet/Makefile.am +++ b/input/packet/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} -pkglibexec_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \ +pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la \ ulogd_inppkt_UNIXSOCK.la ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c diff --git a/input/sum/Makefile.am b/input/sum/Makefile.am index 04051b4..f129193 100644 --- a/input/sum/Makefile.am +++ b/input/sum/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = ${regular_CFLAGS} -pkglibexec_LTLIBRARIES = ulogd_inpflow_NFACCT.la +pkglib_LTLIBRARIES = ulogd_inpflow_NFACCT.la ulogd_inpflow_NFACCT_la_SOURCES = ulogd_inpflow_NFACCT.c ulogd_inpflow_NFACCT_la_LDFLAGS = -avoid-version -module $(LIBMNL_LIBS) $(LIBNETFILTER_ACCT_LIBS) diff --git a/output/Makefile.am b/output/Makefile.am index bb93b28..db05d0b 100644 --- a/output/Makefile.am +++ b/output/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \ SUBDIRS= pcap mysql pgsql sqlite3 dbi -pkglibexec_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \ +pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \ ulogd_output_OPRINT.la ulogd_output_GPRINT.la \ ulogd_output_NACCT.la ulogd_output_XML.la diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am index ca05e00..f413cab 100644 --- a/output/dbi/Makefile.am +++ b/output/dbi/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS} if HAVE_DBI -pkglibexec_LTLIBRARIES = ulogd_output_DBI.la +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} diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am index 5c3afbb..c24208c 100644 --- a/output/mysql/Makefile.am +++ b/output/mysql/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS} if HAVE_MYSQL -pkglibexec_LTLIBRARIES = ulogd_output_MYSQL.la +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} diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am index 54c6da3..47580d2 100644 --- a/output/pcap/Makefile.am +++ b/output/pcap/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS} if HAVE_PCAP -pkglibexec_LTLIBRARIES = ulogd_output_PCAP.la +pkglib_LTLIBRARIES = ulogd_output_PCAP.la ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c ulogd_output_PCAP_la_LIBADD = ${PCAP_LIB} diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am index 32b3ea2..bdaf1d2 100644 --- a/output/pgsql/Makefile.am +++ b/output/pgsql/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = ${regular_CFLAGS} if HAVE_PGSQL -pkglibexec_LTLIBRARIES = ulogd_output_PGSQL.la +pkglib_LTLIBRARIES = ulogd_output_PGSQL.la ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c ulogd_output_PGSQL_la_LIBADD = ${PQLIBS} diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am index d1377b6..dd148ec 100644 --- a/output/sqlite3/Makefile.am +++ b/output/sqlite3/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = ${regular_CFLAGS} ${libsqlite3_CFLAGS} if HAVE_SQLITE3 -pkglibexec_LTLIBRARIES = ulogd_output_SQLITE3.la +pkglib_LTLIBRARIES = ulogd_output_SQLITE3.la ulogd_output_SQLITE3_la_SOURCES = ulogd_output_SQLITE3.c ../../util/db.c ulogd_output_SQLITE3_la_LIBADD = ${libsqlite3_LIBS} diff --git a/ulogd.conf.in b/ulogd.conf.in index cf6987b..e3d4022 100644 --- a/ulogd.conf.in +++ b/ulogd.conf.in @@ -25,30 +25,30 @@ loglevel=1 # 2. options for each plugin in seperate section below -plugin="@pkglibexecdir@/ulogd_inppkt_NFLOG.so" -#plugin="@pkglibexecdir@/ulogd_inppkt_ULOG.so" -#plugin="@pkglibexecdir@/ulogd_inppkt_UNIXSOCK.so" -plugin="@pkglibexecdir@/ulogd_inpflow_NFCT.so" -plugin="@pkglibexecdir@/ulogd_filter_IFINDEX.so" -plugin="@pkglibexecdir@/ulogd_filter_IP2STR.so" -plugin="@pkglibexecdir@/ulogd_filter_IP2BIN.so" -#plugin="@pkglibexecdir@/ulogd_filter_IP2HBIN.so" -plugin="@pkglibexecdir@/ulogd_filter_PRINTPKT.so" -plugin="@pkglibexecdir@/ulogd_filter_HWHDR.so" -plugin="@pkglibexecdir@/ulogd_filter_PRINTFLOW.so" -#plugin="@pkglibexecdir@/ulogd_filter_MARK.so" -plugin="@pkglibexecdir@/ulogd_output_LOGEMU.so" -plugin="@pkglibexecdir@/ulogd_output_SYSLOG.so" -plugin="@pkglibexecdir@/ulogd_output_XML.so" -#plugin="@pkglibexecdir@/ulogd_output_SQLITE3.so" -plugin="@pkglibexecdir@/ulogd_output_GPRINT.so" -#plugin="@pkglibexecdir@/ulogd_output_NACCT.so" -#plugin="@pkglibexecdir@/ulogd_output_PCAP.so" -#plugin="@pkglibexecdir@/ulogd_output_PGSQL.so" -#plugin="@pkglibexecdir@/ulogd_output_MYSQL.so" -#plugin="@pkglibexecdir@/ulogd_output_DBI.so" -plugin="@pkglibexecdir@/ulogd_raw2packet_BASE.so" -plugin="@pkglibexecdir@/ulogd_inpflow_NFACCT.so" +plugin="@pkglibdir@/ulogd_inppkt_NFLOG.so" +#plugin="@pkglibdir@/ulogd_inppkt_ULOG.so" +#plugin="@pkglibdir@/ulogd_inppkt_UNIXSOCK.so" +plugin="@pkglibdir@/ulogd_inpflow_NFCT.so" +plugin="@pkglibdir@/ulogd_filter_IFINDEX.so" +plugin="@pkglibdir@/ulogd_filter_IP2STR.so" +plugin="@pkglibdir@/ulogd_filter_IP2BIN.so" +#plugin="@pkglibdir@/ulogd_filter_IP2HBIN.so" +plugin="@pkglibdir@/ulogd_filter_PRINTPKT.so" +plugin="@pkglibdir@/ulogd_filter_HWHDR.so" +plugin="@pkglibdir@/ulogd_filter_PRINTFLOW.so" +#plugin="@pkglibdir@/ulogd_filter_MARK.so" +plugin="@pkglibdir@/ulogd_output_LOGEMU.so" +plugin="@pkglibdir@/ulogd_output_SYSLOG.so" +plugin="@pkglibdir@/ulogd_output_XML.so" +#plugin="@pkglibdir@/ulogd_output_SQLITE3.so" +plugin="@pkglibdir@/ulogd_output_GPRINT.so" +#plugin="@pkglibdir@/ulogd_output_NACCT.so" +#plugin="@pkglibdir@/ulogd_output_PCAP.so" +#plugin="@pkglibdir@/ulogd_output_PGSQL.so" +#plugin="@pkglibdir@/ulogd_output_MYSQL.so" +#plugin="@pkglibdir@/ulogd_output_DBI.so" +plugin="@pkglibdir@/ulogd_raw2packet_BASE.so" +plugin="@pkglibdir@/ulogd_inpflow_NFACCT.so" # this is a stack for logging packet send by system via LOGEMU #stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -- cgit v1.2.3