[netfilter-cvslog] r4341 - in trunk/libnetfilter_queue: include include/libnetfilter_queue src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-10-09 17:46:20 +0200 (Sun, 09 Oct 2005)
New Revision: 4341

Added:
   trunk/libnetfilter_queue/include/libnetfilter_queue/
Removed:
   trunk/libnetfilter_queue/include/libnfnetlink_queue/
Modified:
   trunk/libnetfilter_queue/include/Makefile.am
   trunk/libnetfilter_queue/include/libnetfilter_queue/Makefile.am
   trunk/libnetfilter_queue/src/Makefile.am
   trunk/libnetfilter_queue/src/libipq_compat.c
   trunk/libnetfilter_queue/src/libnfnetlink_queue.c
   trunk/libnetfilter_queue/utils/Makefile.am
   trunk/libnetfilter_queue/utils/nfqnl_test.c
Log:
rename libnfnetlink_queue to libnetfilter_queue


Modified: trunk/libnetfilter_queue/include/Makefile.am
===================================================================
--- trunk/libnetfilter_queue/include/Makefile.am	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/include/Makefile.am	2005-10-09 15:46:20 UTC (rev 4341)
@@ -1,3 +1,3 @@
 
-SUBDIRS = libnfnetlink_queue
+SUBDIRS = libnetfilter_queue
 

Copied: trunk/libnetfilter_queue/include/libnetfilter_queue (from rev 4339, trunk/libnetfilter_queue/include/libnfnetlink_queue)

Modified: trunk/libnetfilter_queue/include/libnetfilter_queue/Makefile.am
===================================================================
--- trunk/libnetfilter_queue/include/libnfnetlink_queue/Makefile.am	2005-10-09 15:34:34 UTC (rev 4339)
+++ trunk/libnetfilter_queue/include/libnetfilter_queue/Makefile.am	2005-10-09 15:46:20 UTC (rev 4341)
@@ -1,3 +1,3 @@
 
-pkginclude_HEADERS = libnfnetlink_queue.h libipq.h
+pkginclude_HEADERS = libnetfilter_queue.h libipq.h
 

Modified: trunk/libnetfilter_queue/src/Makefile.am
===================================================================
--- trunk/libnetfilter_queue/src/Makefile.am	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/src/Makefile.am	2005-10-09 15:46:20 UTC (rev 4341)
@@ -3,11 +3,11 @@
 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
 

Modified: trunk/libnetfilter_queue/src/libipq_compat.c
===================================================================
--- trunk/libnetfilter_queue/src/libipq_compat.c	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/src/libipq_compat.c	2005-10-09 15:46:20 UTC (rev 4341)
@@ -1,5 +1,5 @@
 /*
- * libipq - backwards compatibility library for libnfnetlink_queue
+ * libipq - backwards compatibility library for libnetfilter_queue
  *
  * (C) 2005 by Harald Welte <laforge at 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>
 
 /****************************************************************************
  *

Modified: trunk/libnetfilter_queue/src/libnfnetlink_queue.c
===================================================================
--- trunk/libnetfilter_queue/src/libnfnetlink_queue.c	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/src/libnfnetlink_queue.c	2005-10-09 15:46:20 UTC (rev 4341)
@@ -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
 {

Modified: trunk/libnetfilter_queue/utils/Makefile.am
===================================================================
--- trunk/libnetfilter_queue/utils/Makefile.am	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/utils/Makefile.am	2005-10-09 15:46:20 UTC (rev 4341)
@@ -4,7 +4,7 @@
 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
 
 

Modified: trunk/libnetfilter_queue/utils/nfqnl_test.c
===================================================================
--- trunk/libnetfilter_queue/utils/nfqnl_test.c	2005-10-09 15:41:45 UTC (rev 4340)
+++ trunk/libnetfilter_queue/utils/nfqnl_test.c	2005-10-09 15:46:20 UTC (rev 4341)
@@ -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[])