diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-14 16:37:04 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-14 16:37:04 +0000 |
| commit | 9ed5ff2dace70b5235682d336a90faaf28377e6e (patch) | |
| tree | b82e53419deaea2d53277b1a0d16fa06913bc882 | |
| parent | d61632a279a4161aa42ce00b8f28083cfdd2ea34 (diff) | |
| download | conntrack-tools-9ed5ff2dace70b5235682d336a90faaf28377e6e.tar.gz conntrack-tools-9ed5ff2dace70b5235682d336a90faaf28377e6e.zip | |
- get rid of KERNELDIR
- use Make_global.am
| -rw-r--r-- | Make_global.am | 1 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | extensions/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Make_global.am b/Make_global.am new file mode 100644 index 0000000..685add7 --- /dev/null +++ b/Make_global.am @@ -0,0 +1 @@ +INCLUDES=$(all_includes) -I$(top_srcdir)/include diff --git a/Makefile.am b/Makefile.am index 46a9220..4962fb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,13 @@ +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 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 diff --git a/extensions/Makefile.am b/extensions/Makefile.am index c1f9cb6..1eaf230 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,6 +1,5 @@ -# AUTOMAKE_OPTIONS = no-dependencies foreign +include $(top_srcdir)/Make_global.am -INCLUDES=-I../include -I${KERNELDIR} CFLAGS=-fPIC -Wall LIBS= diff --git a/src/Makefile.am b/src/Makefile.am index 0116de2..fb1410a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 |