summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.in2
-rw-r--r--extensions/Makefile.am3
-rw-r--r--src/Makefile.am6
-rw-r--r--utils/Makefile.am2
5 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 898acae..528dbf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/configure.in b/configure.in
index 906d34e..be2d882 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT
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
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index b5a343e..1562f72 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,6 +1,7 @@
+include $(top_srcdir)/Make_global.am
+
AUTOMAKE_OPTIONS = no-dependencies foreign
-INCLUDES=-I../include -I${KERNELDIR}
CFLAGS=-fPIC -Wall
LIBS=
diff --git a/src/Makefile.am b/src/Makefile.am
index e7d3a11..4aa79ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,9 @@
-
-# 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
+include $(top_srcdir)/Make_global.am
#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=
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 9aa98be..f87b6b2 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
+include $(top_srcdir)/Make_global.am
bin_PROGRAMS = ctnl_test