[netfilter-cvslog] r4285 - in trunk/libnfnetlink_conntrack: . include src utils

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-09-23 21:19:03 +0200 (Fri, 23 Sep 2005)
New Revision: 4285

Added:
   trunk/libnfnetlink_conntrack/include/Makefile.am
Modified:
   trunk/libnfnetlink_conntrack/autogen.sh
   trunk/libnfnetlink_conntrack/configure.in
   trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
   trunk/libnfnetlink_conntrack/utils/Makefile.am
   trunk/libnfnetlink_conntrack/utils/ctnl_test.c
Log:
fix include paths, use correct automake version, add missing Makefile.am


Modified: trunk/libnfnetlink_conntrack/autogen.sh
===================================================================
--- trunk/libnfnetlink_conntrack/autogen.sh	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/autogen.sh	2005-09-23 19:19:03 UTC (rev 4285)
@@ -11,7 +11,7 @@
     fi
 }
 
-run aclocal
+run aclocal-1.8
 #run autoheader
-run automake -a
+run automake-1.8 -a
 run autoconf

Modified: trunk/libnfnetlink_conntrack/configure.in
===================================================================
--- trunk/libnfnetlink_conntrack/configure.in	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/configure.in	2005-09-23 19:19:03 UTC (rev 4285)
@@ -63,5 +63,5 @@
 
 
 dnl Output the makefile
-AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnfnetlink_conntrack/Makefile utils/Makefile)
+AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile)
 

Added: trunk/libnfnetlink_conntrack/include/Makefile.am
===================================================================
--- trunk/libnfnetlink_conntrack/include/Makefile.am	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/include/Makefile.am	2005-09-23 19:19:03 UTC (rev 4285)
@@ -0,0 +1,2 @@
+
+nobase_include_HEADERS = libnfnetlink_conntrack/libnfnetlink_conntrack.h

Modified: trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c
===================================================================
--- trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/src/libnfnetlink_conntrack.c	2005-09-23 19:19:03 UTC (rev 4285)
@@ -99,7 +99,7 @@
 
 	memset(cth, 0, sizeof(*cth));
 
-	err = nfnl_open(&cth->nfnlh, subsys_id, subscriptions);
+	err = nfnl_open(&cth->nfnlh, subsys_id, IPCTNL_MSG_MAX, subscriptions);
 	if (err < 0) {
 		return err;
 	}

Modified: trunk/libnfnetlink_conntrack/utils/Makefile.am
===================================================================
--- trunk/libnfnetlink_conntrack/utils/Makefile.am	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/utils/Makefile.am	2005-09-23 19:19:03 UTC (rev 4285)
@@ -1,8 +1,8 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
+
 bin_PROGRAMS = ctnl_test
+
 ctnl_test_SOURCES = ctnl_test.c
+ctnl_test_LDADD = ../src/libnfnetlink_conntrack.la
+ctnl_test_LDFLAGS = -dynamic
 
-
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
-
-ctnl_test_LDFLAGS = $(all_libraries) -lnfnetlink_conntrack -lnfnetlink
-

Modified: trunk/libnfnetlink_conntrack/utils/ctnl_test.c
===================================================================
--- trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-09-23 18:59:07 UTC (rev 4284)
+++ trunk/libnfnetlink_conntrack/utils/ctnl_test.c	2005-09-23 19:19:03 UTC (rev 4285)
@@ -12,7 +12,7 @@
 #include <linux/netlink.h>
 #include <linux/netfilter/nfnetlink.h>
 
-#include "libctnetlink.h"
+#include <libnfnetlink_conntrack/libnfnetlink_conntrack.h>
 
 static struct ctnl_handle *cth;