From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 3/3] build: use compile/link information from pkgconfig
Date: Wed, 2 Feb 2011 22:51:07 +0100 [thread overview]
Message-ID: <1296683468-30413-4-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1296683468-30413-1-git-send-email-jengelh@medozas.de>
This is important for when the libraries are in a non-default path.
Also, libs must be listed in LDADD/LIBADD, not LDFLAGS.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
filter/Makefile.am | 5 +++--
output/Makefile.am | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 83a0e52..ee0a722 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = raw2packet packet2flow
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS}
pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \
@@ -9,7 +9,8 @@ pkglibexec_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
ulogd_filter_HWHDR.la ulogd_filter_MARK.la
ulogd_filter_IFINDEX_la_SOURCES = ulogd_filter_IFINDEX.c
-ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module -lnfnetlink
+ulogd_filter_IFINDEX_la_LDFLAGS = -avoid-version -module
+ulogd_filter_IFINDEX_la_LIBADD = ${LIBNFNETLINK_LIBS}
ulogd_filter_PWSNIFF_la_SOURCES = ulogd_filter_PWSNIFF.c
ulogd_filter_PWSNIFF_la_LDFLAGS = -avoid-version -module
diff --git a/output/Makefile.am b/output/Makefile.am
index 3811dad..2ec6e8d 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
+ ${LIBNETFILTER_CONNTRACK_CFLAGS}
SUBDIRS= pcap mysql pgsql sqlite3 dbi
@@ -20,5 +21,6 @@ ulogd_output_NACCT_la_SOURCES = ulogd_output_NACCT.c
ulogd_output_NACCT_la_LDFLAGS = -avoid-version -module
ulogd_output_XML_la_SOURCES = ulogd_output_XML.c
-ulogd_output_XML_la_LDFLAGS = -avoid-version -module -lnetfilter_log \
- -lnetfilter_conntrack
+ulogd_output_XML_la_LIBADD = ${LIBNETFILTER_LOG_LIBS} \
+ ${LIBNETFILTER_CONNTRACK_LIBS}
+ulogd_output_XML_la_LDFLAGS = -avoid-version -module
--
1.7.1
next prev parent reply other threads:[~2011-02-02 21:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-02 21:51 ulogd2: build fixes Jan Engelhardt
2011-02-02 21:51 ` [PATCH 1/3] build: avoid use of LIBS variable Jan Engelhardt
2011-02-02 21:51 ` [PATCH 2/3] build: use appropriate location for program modules Jan Engelhardt
2011-02-02 21:51 ` Jan Engelhardt [this message]
2011-02-03 17:17 ` ulogd2: build fixes Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296683468-30413-4-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).