summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-10-30 23:17:59 +0200
committerJan Engelhardt <jengelh@medozas.de>2010-10-30 23:45:16 +0200
commit3b21fdfbb5336e46fa35c266f0f3c0c8a9ed4a29 (patch)
treee7a54445c3b437d7c2462748b8f888c219572b92
parent7bb2942c276f13360f166d8e7ef9f9e5573af9d7 (diff)
build: use modern call syntax for AC_INIT, AM_INIT_AUTOMAKE
automake options also need to definitely go into configure.ac, otherwise they only apply to a single directory. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 91e2670..4c4400a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
include $(top_srcdir)/Make_global.am
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
EXTRA_DIST = $(man_MANS)
SUBDIRS = src include utils
diff --git a/configure.ac b/configure.ac
index 47f3551..cc86fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(libnfnetlink, 1.0.0)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AC_EXEEXT