summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am11
-rw-r--r--src/Makefile.am4
-rw-r--r--utils/Makefile.am11
-rw-r--r--utils/nfqnl_test.c (renamed from nfqnl_test.c)0
4 files changed, 16 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 6b15391..a580d1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign
EXTRA_DIST = $(man_MANS) acinclude.m4
-INCLUDES=-I../include -I/lib/modules/$(shell (uname -r))/build/include
-CFLAGS=-fPIC -Wall
-LIBS=
-
-lib_LTLIBRARIES = libnfnetlink_queue.la
-
-libnfnetlink_queue_la_LDFLAGS = -Wc,-nostartfiles
-libnfnetlink_queue_la_SOURCES = libnfnetlink_queue.c libipq_compat.c
-
-include_HEADERS = libnfnetlink_queue.h libipq.h
+SUBDIRS = include include/libnfnetlink_queue src utils
man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d0ed94..4e49d41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,3 +13,7 @@ libnfnetlink_queue_la_SOURCES = libnfnetlink_queue.c
libnfnetlink_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles
libnfnetlink_queue_libipq_la_SOURCES = libipq_compat.c
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 0000000..d66d819
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,11 @@
+bin_PROGRAMS = nfqnl_test
+nfqnl_test_SOURCES = nfqnl_test.c
+
+
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
+
+nfqnl_test_LDFLAGS = $(all_libraries) -lnfnetlink_queue -lnfnetlink
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
diff --git a/nfqnl_test.c b/utils/nfqnl_test.c
index 834f5cb..834f5cb 100644
--- a/nfqnl_test.c
+++ b/utils/nfqnl_test.c