From: Jan Engelhardt <jengelh@medozas.de>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 2/7] build: use modern call syntax for AM_INIT_AUTOMAKE
Date: Sun, 31 Oct 2010 00:49:36 +0200 [thread overview]
Message-ID: <1288478982-6758-3-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1288478982-6758-1-git-send-email-jengelh@medozas.de>
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>
---
Makefile.am | 3 ---
configure.ac | 2 +-
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 70c1bd0..23f646c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,6 @@
include Make_global.am
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
man_MANS = conntrack.8 conntrackd.8
EXTRA_DIST = $(man_MANS) Make_global.am doc m4
diff --git a/configure.ac b/configure.ac
index 88faede..f840a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT(conntrack-tools, 0.9.15, pablo@netfilter.org)
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6])
AC_PROG_CC
AM_PROG_LIBTOOL
--
1.7.1
next prev parent reply other threads:[~2010-10-30 22:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-30 22:49 conntrack-tools: build system cleanups Jan Engelhardt
2010-10-30 22:49 ` [PATCH 1/7] build: use autoconf-suggested naming of files Jan Engelhardt
2010-10-30 22:49 ` Jan Engelhardt [this message]
2010-10-30 22:49 ` [PATCH 3/7] build: drop unused $(all_includes) Jan Engelhardt
2010-10-30 22:49 ` [PATCH 4/7] build: remove statements without effect Jan Engelhardt
2010-10-30 22:49 ` [PATCH 5/7] build: remove unused $(all_libraries) Jan Engelhardt
2010-10-30 22:49 ` [PATCH 6/7] build: no need for error message in PKG_CHECK_MODULES Jan Engelhardt
2010-10-30 22:49 ` [PATCH 7/7] Add .gitignore files Jan Engelhardt
2010-11-01 21:37 ` conntrack-tools: build system cleanups Pablo Neira Ayuso
2010-11-01 21:38 ` Jan Engelhardt
2010-11-01 21:40 ` Jan Engelhardt
2010-11-01 22:09 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288478982-6758-3-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).