[netfilter-cvslog] r4195 - in trunk/libnfnetlink_queue: . src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-30 22:59:07 +0200 (Sat, 30 Jul 2005)
New Revision: 4195

Added:
   trunk/libnfnetlink_queue/utils/Makefile.am
   trunk/libnfnetlink_queue/utils/nfqnl_test.c
Removed:
   trunk/libnfnetlink_queue/nfqnl_test.c
Modified:
   trunk/libnfnetlink_queue/Makefile.am
   trunk/libnfnetlink_queue/src/Makefile.am
Log:
more restructuring work


Modified: trunk/libnfnetlink_queue/Makefile.am
===================================================================
--- trunk/libnfnetlink_queue/Makefile.am	2005-07-30 20:55:43 UTC (rev 4194)
+++ trunk/libnfnetlink_queue/Makefile.am	2005-07-30 20:59:07 UTC (rev 4195)
@@ -2,17 +2,8 @@
 
 EXTRA_DIST = $(man_MANS) acinclude.m4
 
-INCLUDES=-I../include -I/lib/modules/$(shell (uname -r))/build/include
-CFLAGS=-fPIC -Wall
-LIBS=
+SUBDIRS = include include/libnfnetlink_queue src utils
 
-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
-
 man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7
 
 $(OBJECTS): libtool

Deleted: trunk/libnfnetlink_queue/nfqnl_test.c
===================================================================
--- trunk/libnfnetlink_queue/nfqnl_test.c	2005-07-30 20:55:43 UTC (rev 4194)
+++ trunk/libnfnetlink_queue/nfqnl_test.c	2005-07-30 20:59:07 UTC (rev 4195)
@@ -1,34 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netinet/in.h>
-
-#include "libnfnetlink_queue.h"
-
-int main(int argc, char **argv)
-{
-	struct nfqnl_handle h;
-	struct nfqnl_q_handle qh;
-	int rv;
-	char buf[4096];
-
-	rv = nfqnl_open(&h);
-	if (rv < 0)
-		exit(rv);
-
-	nfqnl_bind_pf(&h, AF_INET);
-	nfqnl_create_queue(&h, &qh, 0);
-	nfqnl_set_mode(&qh, NFQNL_COPY_PACKET, 0xffff);
-
-	while (recv(h.nfnlh.fd, buf, sizeof(buf), 0) > 0) {
-		printf("pkt received\n");
-	}
-
-	nfqnl_destroy_queue(&qh);
-	nfqnl_unbind_pf(&h, AF_INET);
-
-	nfqnl_close(&h);
-
-	exit(0);
-}

Modified: trunk/libnfnetlink_queue/src/Makefile.am
===================================================================
--- trunk/libnfnetlink_queue/src/Makefile.am	2005-07-30 20:55:43 UTC (rev 4194)
+++ trunk/libnfnetlink_queue/src/Makefile.am	2005-07-30 20:59:07 UTC (rev 4195)
@@ -13,3 +13,7 @@
 
 libnfnetlink_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles
 libnfnetlink_queue_libipq_la_SOURCES = libipq_compat.c
+
+$(OBJECTS): libtool
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck

Added: trunk/libnfnetlink_queue/utils/Makefile.am
===================================================================
--- trunk/libnfnetlink_queue/utils/Makefile.am	2005-07-30 20:55:43 UTC (rev 4194)
+++ trunk/libnfnetlink_queue/utils/Makefile.am	2005-07-30 20:59:07 UTC (rev 4195)
@@ -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

Copied: trunk/libnfnetlink_queue/utils/nfqnl_test.c (from rev 4194, trunk/libnfnetlink_queue/nfqnl_test.c)