summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/Makefile.am2
-rw-r--r--include/libnetfilter_queue/Makefile.am3
-rw-r--r--include/libnetfilter_queue/libipq.h (renamed from include/libnfnetlink_queue/libipq.h)0
-rw-r--r--include/libnetfilter_queue/libnfnetlink_queue.h (renamed from include/libnfnetlink_queue/libnfnetlink_queue.h)0
-rw-r--r--include/libnfnetlink_queue/Makefile.am3
-rw-r--r--src/Makefile.am10
-rw-r--r--src/libipq_compat.c6
-rw-r--r--src/libnfnetlink_queue.c2
-rw-r--r--utils/Makefile.am2
-rw-r--r--utils/nfqnl_test.c2
10 files changed, 15 insertions, 15 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 4040f9f..42fd733 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libnfnetlink_queue
+SUBDIRS = libnetfilter_queue
diff --git a/include/libnetfilter_queue/Makefile.am b/include/libnetfilter_queue/Makefile.am
new file mode 100644
index 0000000..fc9a2f6
--- /dev/null
+++ b/include/libnetfilter_queue/Makefile.am
@@ -0,0 +1,3 @@
+
+pkginclude_HEADERS = libnetfilter_queue.h libipq.h
+
diff --git a/include/libnfnetlink_queue/libipq.h b/include/libnetfilter_queue/libipq.h
index 06c10c1..06c10c1 100644
--- a/include/libnfnetlink_queue/libipq.h
+++ b/include/libnetfilter_queue/libipq.h
diff --git a/include/libnfnetlink_queue/libnfnetlink_queue.h b/include/libnetfilter_queue/libnfnetlink_queue.h
index 9c2b40d..9c2b40d 100644
--- a/include/libnfnetlink_queue/libnfnetlink_queue.h
+++ b/include/libnetfilter_queue/libnfnetlink_queue.h
diff --git a/include/libnfnetlink_queue/Makefile.am b/include/libnfnetlink_queue/Makefile.am
deleted file mode 100644
index ebdfd5c..0000000
--- a/include/libnfnetlink_queue/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pkginclude_HEADERS = libnfnetlink_queue.h libipq.h
-
diff --git a/src/Makefile.am b/src/Makefile.am
index c75d708..d9f1f75 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
AM_CFLAGS=-fPIC -Wall
LIBS=
-lib_LTLIBRARIES = libnfnetlink_queue.la libnfnetlink_queue_libipq.la
+lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_libipq.la
-libnfnetlink_queue_la_LDFLAGS = -Wc,-nostartfiles
-libnfnetlink_queue_la_SOURCES = libnfnetlink_queue.c
+libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles
+libnetfilter_queue_la_SOURCES = libnetfilter_queue.c
-libnfnetlink_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles
-libnfnetlink_queue_libipq_la_SOURCES = libipq_compat.c
+libnetfilter_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles
+libnetfilter_queue_libipq_la_SOURCES = libipq_compat.c
diff --git a/src/libipq_compat.c b/src/libipq_compat.c
index d263aed..86481ac 100644
--- a/src/libipq_compat.c
+++ b/src/libipq_compat.c
@@ -1,5 +1,5 @@
/*
- * libipq - backwards compatibility library for libnfnetlink_queue
+ * libipq - backwards compatibility library for libnetfilter_queue
*
* (C) 2005 by Harald Welte <laforge@netfilter.org>
*
@@ -27,8 +27,8 @@
#include <sys/time.h>
#include <sys/types.h>
-#include <libnfnetlink_queue/libnfnetlink_queue.h>
-#include <libnfnetlink_queue/libipq.h>
+#include <libnetfilter_queue/libnetfilter_queue.h>
+#include <libnetfilter_queue/libipq.h>
/****************************************************************************
*
diff --git a/src/libnfnetlink_queue.c b/src/libnfnetlink_queue.c
index 10ece48..8e84c50 100644
--- a/src/libnfnetlink_queue.c
+++ b/src/libnfnetlink_queue.c
@@ -27,7 +27,7 @@
#include <sys/socket.h>
#include <libnfnetlink/libnfnetlink.h>
-#include <libnfnetlink_queue/libnfnetlink_queue.h>
+#include <libnetfilter_queue/libnetfilter_queue.h>
struct nfqnl_handle
{
diff --git a/utils/Makefile.am b/utils/Makefile.am
index c7ed00b..4ccc1ad 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
bin_PROGRAMS = nfqnl_test
nfqnl_test_SOURCES = nfqnl_test.c
-nfqnl_test_LDADD = ../src/libnfnetlink_queue.la
+nfqnl_test_LDADD = ../src/libnetfilter_queue.la
nfqnl_test_LDFLAGS = -dynamic
diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
index ae8c072..26de1c5 100644
--- a/utils/nfqnl_test.c
+++ b/utils/nfqnl_test.c
@@ -5,7 +5,7 @@
#include <netinet/in.h>
#include <linux/netfilter.h> /* for NF_ACCEPT */
-#include <libnfnetlink_queue/libnfnetlink_queue.h>
+#include <libnetfilter_queue/libnetfilter_queue.h>
/* returns packet id */
static u_int32_t print_pkt (struct nfattr *tb[])