summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2012-09-21 03:55:39 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-09-21 16:06:33 +0200
commita95338a1715b025bf1b39136ba10de5907c1080b (patch)
treee0a24f5f998fe1c09fd27b9720701998e6a34fe7
parentfebb3cceac1889fb6558b8ef40ac733072fdcd47 (diff)
downloadconntrack-tools-a95338a1715b025bf1b39136ba10de5907c1080b.tar.gz
conntrack-tools-a95338a1715b025bf1b39136ba10de5907c1080b.zip
build: fix libraries dependencies in Makefiles
Several includes are missing when netfilter libs are not in the standard path. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--Make_global.am4
-rw-r--r--src/Makefile.am4
2 files changed, 5 insertions, 3 deletions
diff --git a/Make_global.am b/Make_global.am
index 7b5342d..23c7dd0 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -4,4 +4,6 @@ AM_CFLAGS = -std=gnu99 -W -Wall \
-Wmissing-prototypes -Wwrite-strings -Wcast-qual -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wsign-compare -Waggregate-return -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wstrict-prototypes -Wundef \
-Wno-unused-parameter ${LIBNFNETLINK_CFLAGS} ${LIBMNL_CFLAGS} \
${LIBNETFILTER_CONNTRACK_CFLAGS} \
- ${LIBNETFILTER_CTTIMEOUT_CFLAGS}
+ ${LIBNETFILTER_CTTIMEOUT_CFLAGS} \
+ ${LIBNETFILTER_QUEUE_CFLAGS} \
+ ${LIBNETFILTER_CTHELPER_CFLAGS}
diff --git a/src/Makefile.am b/src/Makefile.am
index d8074d2..ec03e46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ CLEANFILES = read_config_yy.c read_config_lex.c
sbin_PROGRAMS = conntrack conntrackd nfct
conntrack_SOURCES = conntrack.c
-conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_gre.la ../extensions/libct_proto_unknown.la ${LIBNETFILTER_CONNTRACK_LIBS} ${LIBMNL_LIBS}
+conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_gre.la ../extensions/libct_proto_unknown.la ${LIBNETFILTER_CONNTRACK_LIBS} ${LIBMNL_LIBS} ${LIBNFNETLINK_LIBS}
nfct_SOURCES = nfct.c \
helpers.c \
@@ -46,7 +46,7 @@ read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-mi
conntrackd_LDADD = ${LIBMNL_LIBS} ${LIBNETFILTER_CONNTRACK_LIBS} \
${LIBNETFILTER_QUEUE_LIBS} ${LIBNETFILTER_CTHELPER_LIBS} \
- ${libdl_LIBS}
+ ${libdl_LIBS} ${LIBNFNETLINK_LIBS}
conntrackd_LDFLAGS = -export-dynamic