diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-11-14 16:17:59 -0800 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-11-15 11:00:39 -0800 |
| commit | 33bd0102c190c1331804c12774e578e33c367552 (patch) | |
| tree | 1f1d1fc2c78931f9c50016d16b47149bc2df75e0 /gnulib/update-gnulib.sh | |
| parent | 71d3dc74309599cd9bbdfa17dcfdfd8c406a1093 (diff) | |
| download | binutils-gdb-33bd0102c190c1331804c12774e578e33c367552.tar.gz | |
Generate gnulib's toplevel Makefile.in using automake
This is a lot simpler and as a side-effect this will correctly
regenerate import/Makefile and config.h during rebuilds if
necessary.
gnulib/ChangeLog:
2019-11-15 Christian Biesinger <cbiesinger@google.com>
* Makefile.am: New file.
* Makefile.in: Replace with generated file.
* aclocal-m4-deps.mk: Remove.
* configure.ac: Use the foreign option for automake and specify
the aclocal search path here.
* update-gnulib.sh: Don't generate aclocal-m4-deps.mk anymore.
Also don't specify the aclocal include path here, now that it
is in configure.ac.
Change-Id: I6a2c4d41cf4f0e21d5c813197bad63ed5c08e408
Diffstat (limited to 'gnulib/update-gnulib.sh')
| -rwxr-xr-x | gnulib/update-gnulib.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh index 0c8357c8880..634676a68d8 100755 --- a/gnulib/update-gnulib.sh +++ b/gnulib/update-gnulib.sh @@ -174,7 +174,7 @@ apply_patches "patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o apply_patches "patches/0003-Fix-glob-c-Coverity-issues.patch" # Regenerate all necessary files... -aclocal -Iimport/m4 -I../config && +aclocal && autoconf && autoheader && automake @@ -182,15 +182,3 @@ if [ $? -ne 0 ]; then echo "Error: Failed to regenerate Makefiles and configure scripts." exit 1 fi - -# Update aclocal-m4-deps.mk -ACLOCAL_M4_DEPS_FILE=aclocal-m4-deps.mk -cat > ${ACLOCAL_M4_DEPS_FILE}.tmp <<EOF -# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: -aclocal_m4_deps = \\ -$(find import/m4 -type f -name "*.m4" | LC_COLLATE=C sort | \ - sed 's/^/ /; s/$/ \\/; $s/ \\//g') -EOF - -../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE} -rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp |