From 31f1ad426e83303c0d373b1c95003b6bcf8cd8c7 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 26 Dec 2017 22:58:37 +0100 Subject: [PATCH] move automake's "foreign" switch to the proper place Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2c33e1a82b75ea1901024cc2b0b2a1dbb03717d2 Author: Stefan Seyfried Date: 2017-12-26 (Tue, 26 Dec 2017) --- Makefile.am | 2 -- autogen.sh | 2 +- configure.ac | 2 +- src/zapit/Makefile.am | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f904ffde..37538d38e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = gnu - SUBDIRS = lib src data locale-update: diff --git a/autogen.sh b/autogen.sh index bea6a1cd6..043513b4c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,4 +12,4 @@ aclocal --force libtoolize --force autoconf --force autoheader --force -automake --add-missing --force-missing --foreign +automake --add-missing --force-missing diff --git a/configure.ac b/configure.ac index 79f5b8b90..c05a862ee 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ define(ver_minor, 50) define(ver_micro, 0) AC_INIT(NI-Neutrino, ver_major.ver_minor.ver_micro) -AM_INIT_AUTOMAKE([1.0.1 nostdinc]) +AM_INIT_AUTOMAKE([nostdinc foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_DEFINE(RELEASE_CYCLE, "ver_major.0", [Release cycle information; used in update code]) diff --git a/src/zapit/Makefile.am b/src/zapit/Makefile.am index 2ec97d007..f801c5ce1 100644 --- a/src/zapit/Makefile.am +++ b/src/zapit/Makefile.am @@ -1,4 +1 @@ -AUTOMAKE_OPTIONS = gnu - SUBDIRS = lib src data -