autotools: Don't require custom automake options

We need a couple of automake options to prevent errors when regenerating
Makefile.ins during source preparation.

Some makefiles assume GNU make, so add 'foreign' where necessary. Also,
we are building objects in subdirectories, so we need 'subdir-objects'.

Modified to suit recent petitboot by Jeremy Kerr <jk@ozlabs.org>

Signed-off-by: Jeff Bailey <jeffbailey@google.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/Makefile.am b/Makefile.am
index cc5fdfa6bb5edc04a742a553904bcbd098c890af..42921b31c5f4f32372b5a746d1bc75d4fa0a3f3a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 #  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
 SUBDIRS = lib discover test ui utils man
 
 ACLOCAL_AMFLAGS = -I m4

diff --git a/bootstrap b/bootstrap
index 9f28c428be1c9dacffc4ddfbbd8b0743c44a7f09..91ba8c827b1a2add8c910f43f174e7bd05308da1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -40,5 +40,5 @@ sed -e s,@version@,${version},g configure.ac.in > configure.ac
 aclocal
 libtoolize --force --copy
 autoheader
 aclocal
 libtoolize --force --copy
 autoheader

-automake --foreign --add-missing --copy
+automake --add-missing --copy

 autoconf
 autoconf

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f6009cfd84ee3a0e6dae988715cc67593ddb218f..5fc8911bd3f8988afbfc3f3725603974898dec9c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,6 +12,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 #  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)"'
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS) \
        -DPREFIX='"$(prefix)"'
 

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 283b284a621c84a3802f5cfefb5d9c3fcecf2e0c..f0eff9e37de4a5698ca9d9bdf668a7c6239852fb 100644 (file)
--- 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
 
 #  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) \
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \