diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-07-30 20:59:07 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-07-30 20:59:07 +0000 |
| commit | 5c4d06957c850d884dabe015ba11844af6a755a8 (patch) | |
| tree | aab2ea1058b3935fcb366f22ec8a8b8d584e7bda | |
| parent | 689346d6528085eb4216007d658bd7f34ee6cb60 (diff) | |
more restructuring work
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | utils/Makefile.am | 11 | ||||
| -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 |