diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rwxr-xr-x | bootstrap | 9 | ||||
-rw-r--r-- | configure.ac | 6 |
4 files changed, 13 insertions, 7 deletions
@@ -21,6 +21,7 @@ libtool ltmain.sh missing stamp-h1 +build-aux autom4te.cache ell diff --git a/Makefile.am b/Makefile.am index 2d363465..5579ed25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ AM_MAKEFLAGS = --no-print-directory +ACLOCAL_AMFLAGS = -I build-aux + noinst_LTLIBRARIES = if EXTERNAL_ELL @@ -1133,7 +1135,7 @@ ell/ell.h: Makefile done maintainer-clean-local: - -rm -rf ell + -rm -rf build-aux ell clean-local: @$(RM) -rf include/ofono @@ -1,8 +1,7 @@ #!/bin/sh -aclocal && \ - autoheader && \ - libtoolize --automake --copy --force && \ - autoconf && \ - automake --add-missing --copy +if [ ! -d build-aux ]; then + mkdir build-aux +fi +autoreconf --force --install --symlink diff --git a/configure.ac b/configure.ac index ebaa29ba..59cbac53 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,12 @@ AC_PREREQ([2.69]) AC_INIT([ofono], [1.34]) -AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) AC_CONFIG_HEADERS(config.h) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(build-aux) + +AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules + tar-pax no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |