summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rwxr-xr-xbootstrap2
-rw-r--r--lib/Makefile.am2
-rw-r--r--test/parser/Makefile.am2
4 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cc5fdfa..42921b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+AUTOMAKE_OPTIONS = foreign
+
SUBDIRS = lib discover test ui utils man
ACLOCAL_AMFLAGS = -I m4
diff --git a/bootstrap b/bootstrap
index 9f28c42..91ba8c8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -40,5 +40,5 @@ sed -e s,@version@,${version},g configure.ac.in > configure.ac
aclocal
libtoolize --force --copy
autoheader
-automake --foreign --add-missing --copy
+automake --add-missing --copy
autoconf
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f6009cf..5fc8911 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,6 +12,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+AUTOMAKE_OPTIONS = subdir-objects
+
AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS) \
-DPREFIX='"$(prefix)"'
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 283b284..f0eff9e 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -11,7 +11,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = parallel-tests foreign
AM_CPPFLAGS = \
-I$(top_srcdir) \
OpenPOWER on IntegriCloud