summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>2012-06-29 13:01:22 -0700
committerHarald Welte <laforge@gnumonks.org>2012-06-30 22:01:43 +0200
commit8dd81fa31f31e986396b23fc0844af206a216c9e (patch)
treecdf578082c34c1cada3d91c75d063ed57f264f1c
parenta1ed2f0bb1564b993649096dfc82afe28a3759e4 (diff)
build: avoid duplication of automake options, add no-dist-gzip.
There's little to no point to build the gzip version of the tarball when we're building the bzip2 version. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 9fdb4abb..794d1a24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
ACLOCAL_AMFLAGS = -I m4
INCLUDES = $(all_includes) -I$(top_srcdir)/include
diff --git a/configure.ac b/configure.ac
index 728173e4..42d7b577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([libosmocore],
m4_esyscmd([./git-version-gen .tarball-version]),
[openbsc@lists.osmocom.org])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6])
AC_CONFIG_TESTDIR(tests)
dnl kernel style compile messages