diff options
| author | Jeff Bailey <jeffbailey@google.com> | 2014-03-14 09:04:00 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-07-16 08:43:08 +0800 |
| commit | 5d46b27435464c603340179bc2dbad45358f2d14 (patch) | |
| tree | 416cbfdd8d78373e67d575ff54b3d5146ce77830 | |
| parent | b90b84b36d01f6663a79d9467a37cd9d6f6a68e7 (diff) | |
| download | talos-petitboot-5d46b27435464c603340179bc2dbad45358f2d14.tar.gz talos-petitboot-5d46b27435464c603340179bc2dbad45358f2d14.zip | |
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>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | test/parser/Makefile.am | 2 |
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 @@ -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) \ |
