From 3b221a60607db443f5addebb87058210c4ffef71 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Sat, 30 Jul 2005 20:59:07 +0000 Subject: [PATCH] more restructuring work --- Makefile.am | 11 +---------- src/Makefile.am | 4 ++++ utils/Makefile.am | 11 +++++++++++ nfqnl_test.c => utils/nfqnl_test.c | 0 4 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 utils/Makefile.am rename nfqnl_test.c => utils/nfqnl_test.c (100%) 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 similarity index 100% rename from nfqnl_test.c rename to utils/nfqnl_test.c -- 2.7.4