[netfilter-cvslog] r4523 - in trunk/libnetfilter_conntrack: . extensions src utils

laforge at netfilter.org laforge at netfilter.org
Mon Nov 14 17:10:45 CET 2005


Author: laforge at netfilter.org
Date: 2005-11-14 17:10:44 +0100 (Mon, 14 Nov 2005)
New Revision: 4523

Modified:
   trunk/libnetfilter_conntrack/Makefile.am
   trunk/libnetfilter_conntrack/configure.in
   trunk/libnetfilter_conntrack/extensions/Makefile.am
   trunk/libnetfilter_conntrack/src/Makefile.am
   trunk/libnetfilter_conntrack/utils/Makefile.am
Log:
- get rid of KERNELDIR include
- have only one place where we specify the includes (Make_global.am)



Modified: trunk/libnetfilter_conntrack/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/Makefile.am	2005-11-14 16:03:30 UTC (rev 4522)
+++ trunk/libnetfilter_conntrack/Makefile.am	2005-11-14 16:10:44 UTC (rev 4523)
@@ -1,6 +1,7 @@
+include $(top_srcdir)/Make_global.am
+
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
-INCLUDES =$(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
 SUBDIRS	= include src extensions utils
 LINKOPTS = -lnfnetlink
 

Modified: trunk/libnetfilter_conntrack/configure.in
===================================================================
--- trunk/libnetfilter_conntrack/configure.in	2005-11-14 16:03:30 UTC (rev 4522)
+++ trunk/libnetfilter_conntrack/configure.in	2005-11-14 16:10:44 UTC (rev 4523)
@@ -4,7 +4,7 @@
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.27)
+AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.28)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL

Modified: trunk/libnetfilter_conntrack/extensions/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-14 16:03:30 UTC (rev 4522)
+++ trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-14 16:10:44 UTC (rev 4523)
@@ -1,6 +1,7 @@
+include $(top_srcdir)/Make_global.am
+
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-INCLUDES=-I../include -I${KERNELDIR}
 CFLAGS=-fPIC -Wall
 LIBS=
 

Modified: trunk/libnetfilter_conntrack/src/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/src/Makefile.am	2005-11-14 16:03:30 UTC (rev 4522)
+++ trunk/libnetfilter_conntrack/src/Makefile.am	2005-11-14 16:10:44 UTC (rev 4523)
@@ -1,13 +1,9 @@
+include $(top_srcdir)/Make_global.am
 
-# This is _NOT_ the library release version, it's an API version.
-# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
-LIBVERSION=1:0:0
-
 #AUTOMAKE_OPTIONS = no-dependencies foreign
 
 #EXTRA_DIST = $(man_MANS) acinclude.m4
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
 AM_CFLAGS=-fPIC -Wall
 LIBS=
 

Modified: trunk/libnetfilter_conntrack/utils/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/utils/Makefile.am	2005-11-14 16:03:30 UTC (rev 4522)
+++ trunk/libnetfilter_conntrack/utils/Makefile.am	2005-11-14 16:10:44 UTC (rev 4523)
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
+include $(top_srcdir)/Make_global.am
 
 bin_PROGRAMS = ctnl_test
 




More information about the netfilter-cvslog mailing list