[netfilter-cvslog] r4533 - in trunk/conntrack: . extensions src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-14 17:37:04 +0100 (Mon, 14 Nov 2005)
New Revision: 4533

Added:
   trunk/conntrack/Make_global.am
Modified:
   trunk/conntrack/Makefile.am
   trunk/conntrack/extensions/Makefile.am
   trunk/conntrack/src/Makefile.am
Log:
- get rid of KERNELDIR
- use Make_global.am


Added: trunk/conntrack/Make_global.am
===================================================================
--- trunk/conntrack/Make_global.am	2005-11-14 16:34:28 UTC (rev 4532)
+++ trunk/conntrack/Make_global.am	2005-11-14 16:37:04 UTC (rev 4533)
@@ -0,0 +1 @@
+INCLUDES=$(all_includes) -I$(top_srcdir)/include

Modified: trunk/conntrack/Makefile.am
===================================================================
--- trunk/conntrack/Makefile.am	2005-11-14 16:34:28 UTC (rev 4532)
+++ trunk/conntrack/Makefile.am	2005-11-14 16:37:04 UTC (rev 4533)
@@ -1,3 +1,5 @@
+include Make_global.am
+
 # not a GNU package. You can remove this line, if
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
@@ -4,9 +6,8 @@
 
 man_MANS = conntrack.8
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) Make_global.am
 
-INCLUDES  = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
 SUBDIRS   = src extensions
 DIST_SUBDIRS = include src extensions
 LINKOPTS  = -ldl -lnetfilter_conntrack

Modified: trunk/conntrack/extensions/Makefile.am
===================================================================
--- trunk/conntrack/extensions/Makefile.am	2005-11-14 16:34:28 UTC (rev 4532)
+++ trunk/conntrack/extensions/Makefile.am	2005-11-14 16:37:04 UTC (rev 4533)
@@ -1,6 +1,5 @@
-# AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Make_global.am
 
-INCLUDES=-I../include -I${KERNELDIR}
 CFLAGS=-fPIC -Wall
 LIBS=
 

Modified: trunk/conntrack/src/Makefile.am
===================================================================
--- trunk/conntrack/src/Makefile.am	2005-11-14 16:34:28 UTC (rev 4532)
+++ trunk/conntrack/src/Makefile.am	2005-11-14 16:37:04 UTC (rev 4533)
@@ -1,8 +1,7 @@
+include $(top_srcdir)/Make_global.am
+
 sbin_PROGRAMS = conntrack
 conntrack_SOURCES = conntrack.c
 
-INCLUDES= $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
 conntrack_LDFLAGS = $(all_libraries) -rdynamic
  
-#AM_CFLAGS = -g
-#LINKOPTS=-ldl -lnfnetlink -lctnetlink -rdynamic