Automatically update "aclocal_m4_deps" when updating gnulib
When we update gnulib using our "update-gnulib.sh" tool, it doesn't automatically update the list of M4 files present at gnulib/Makefile.in:aclocal_m4_deps. This patch extends the tool to do that. It also puts "aclocal_m4_deps" in its own file (a Makefile fragment), so that it's easier to update it programatically. Tested by generating the file and diff'ing the results against the current version of "aclocal_m4_deps". gdb/ChangeLog: 2018-09-04 Sergio Durigan Junior <sergiodj@redhat.com> Pedro Alves <palves@redhat.com> * gnulib/Makefile.in (aclocal_m4_deps): Move to "aclocal-m4-deps.mk". Include file here. $(srcdir)/aclocal.m4: Add "configure.ac". * gnulib/aclocal-m4-deps.mk: New file. * gnulib/update-gnulib.sh: Automatically update "aclocal-m4-deps.mk".
This commit is contained in:
Sergio Durigan Junior
parent
d53d543682
commit
fcc9b044b7
|
|
@ -1,3 +1,13 @@
|
|||
2018-09-04 Sergio Durigan Junior <sergiodj@redhat.com>
|
||||
Pedro Alves <palves@redhat.com>
|
||||
|
||||
* gnulib/Makefile.in (aclocal_m4_deps): Move to
|
||||
"aclocal-m4-deps.mk". Include file here.
|
||||
$(srcdir)/aclocal.m4: Add "configure.ac".
|
||||
* gnulib/aclocal-m4-deps.mk: New file.
|
||||
* gnulib/update-gnulib.sh: Automatically update
|
||||
"aclocal-m4-deps.mk".
|
||||
|
||||
2018-09-04 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* configure: Rebuild.
|
||||
|
|
|
|||
|
|
@ -200,144 +200,10 @@ config.status: $(srcdir)/configure
|
|||
|
||||
ACLOCAL = aclocal
|
||||
ACLOCAL_AMFLAGS = -I import/m4 -I ../../config
|
||||
aclocal_m4_deps = \
|
||||
configure.ac \
|
||||
import/m4/flexmember.m4 \
|
||||
import/m4/eealloc.m4 \
|
||||
import/m4/mkdir.m4 \
|
||||
import/m4/close.m4 \
|
||||
import/m4/unistd-safer.m4 \
|
||||
import/m4/inttypes-pri.m4 \
|
||||
import/m4/chdir-long.m4 \
|
||||
import/m4/gnulib-common.m4 \
|
||||
import/m4/readdir.m4 \
|
||||
import/m4/stdlib_h.m4 \
|
||||
import/m4/getlogin_r.m4 \
|
||||
import/m4/warn-on-use.m4 \
|
||||
import/m4/getdtablesize.m4 \
|
||||
import/m4/rewinddir.m4 \
|
||||
import/m4/string_h.m4 \
|
||||
import/m4/closedir.m4 \
|
||||
import/m4/canonicalize.m4 \
|
||||
import/m4/stdio_h.m4 \
|
||||
import/m4/fdopendir.m4 \
|
||||
import/m4/getcwd-abort-bug.m4 \
|
||||
import/m4/alloca.m4 \
|
||||
import/m4/strstr.m4 \
|
||||
import/m4/stat-time.m4 \
|
||||
import/m4/builtin-expect.m4 \
|
||||
import/m4/rawmemchr.m4 \
|
||||
import/m4/msvc-nothrow.m4 \
|
||||
import/m4/absolute-header.m4 \
|
||||
import/m4/isnanl.m4 \
|
||||
import/m4/stddef_h.m4 \
|
||||
import/m4/gnulib-tool.m4 \
|
||||
import/m4/realloc.m4 \
|
||||
import/m4/d-type.m4 \
|
||||
import/m4/frexp.m4 \
|
||||
import/m4/getcwd-path-max.m4 \
|
||||
import/m4/dup2.m4 \
|
||||
import/m4/strtok_r.m4 \
|
||||
import/m4/exponentd.m4 \
|
||||
import/m4/std-gnu11.m4 \
|
||||
import/m4/locale-ja.m4 \
|
||||
import/m4/gettimeofday.m4 \
|
||||
import/m4/time_h.m4 \
|
||||
import/m4/malloc.m4 \
|
||||
import/m4/fnmatch_h.m4 \
|
||||
import/m4/codeset.m4 \
|
||||
import/m4/getcwd.m4 \
|
||||
import/m4/readlink.m4 \
|
||||
import/m4/locale-zh.m4 \
|
||||
import/m4/stdint.m4 \
|
||||
import/m4/memrchr.m4 \
|
||||
import/m4/onceonly.m4 \
|
||||
import/m4/pathmax.m4 \
|
||||
import/m4/rename.m4 \
|
||||
import/m4/rmdir.m4 \
|
||||
import/m4/dup.m4 \
|
||||
import/m4/errno_h.m4 \
|
||||
import/m4/mbrtowc.m4 \
|
||||
import/m4/environ.m4 \
|
||||
import/m4/wchar_h.m4 \
|
||||
import/m4/strchrnul.m4 \
|
||||
import/m4/fcntl_h.m4 \
|
||||
import/m4/getpagesize.m4 \
|
||||
import/m4/largefile.m4 \
|
||||
import/m4/openat.m4 \
|
||||
import/m4/save-cwd.m4 \
|
||||
import/m4/stat.m4 \
|
||||
import/m4/include_next.m4 \
|
||||
import/m4/mmap-anon.m4 \
|
||||
import/m4/mode_t.m4 \
|
||||
import/m4/exponentl.m4 \
|
||||
import/m4/sys_types_h.m4 \
|
||||
import/m4/fcntl-o.m4 \
|
||||
import/m4/stdbool.m4 \
|
||||
import/m4/float_h.m4 \
|
||||
import/m4/msvc-inval.m4 \
|
||||
import/m4/wctype_h.m4 \
|
||||
import/m4/gnulib-cache.m4 \
|
||||
import/m4/mbsrtowcs.m4 \
|
||||
import/m4/limits-h.m4 \
|
||||
import/m4/locale-fr.m4 \
|
||||
import/m4/fstatat.m4 \
|
||||
import/m4/inttypes.m4 \
|
||||
import/m4/memchr.m4 \
|
||||
import/m4/glob.m4 \
|
||||
import/m4/fstat.m4 \
|
||||
import/m4/sys_stat_h.m4 \
|
||||
import/m4/off_t.m4 \
|
||||
import/m4/strdup.m4 \
|
||||
import/m4/ssize_t.m4 \
|
||||
import/m4/math_h.m4 \
|
||||
import/m4/unistd_h.m4 \
|
||||
import/m4/fpieee.m4 \
|
||||
import/m4/mempcpy.m4 \
|
||||
import/m4/wint_t.m4 \
|
||||
import/m4/d-ino.m4 \
|
||||
import/m4/setenv.m4 \
|
||||
import/m4/open-cloexec.m4 \
|
||||
import/m4/longlong.m4 \
|
||||
import/m4/multiarch.m4 \
|
||||
import/m4/filenamecat.m4 \
|
||||
import/m4/gnulib-comp.m4 \
|
||||
import/m4/mkstemp.m4 \
|
||||
import/m4/dirfd.m4 \
|
||||
import/m4/getlogin.m4 \
|
||||
import/m4/signal_h.m4 \
|
||||
import/m4/sys_socket_h.m4 \
|
||||
import/m4/dirname.m4 \
|
||||
import/m4/00gnulib.m4 \
|
||||
import/m4/dirent_h.m4 \
|
||||
import/m4/opendir.m4 \
|
||||
import/m4/error.m4 \
|
||||
import/m4/extensions.m4 \
|
||||
import/m4/fchdir.m4 \
|
||||
import/m4/mbsinit.m4 \
|
||||
import/m4/__inline.m4 \
|
||||
import/m4/extern-inline.m4 \
|
||||
import/m4/fnmatch.m4 \
|
||||
import/m4/lstat.m4 \
|
||||
import/m4/nocrash.m4 \
|
||||
import/m4/sys_time_h.m4 \
|
||||
import/m4/localcharset.m4 \
|
||||
import/m4/open.m4 \
|
||||
import/m4/localtime-buffer.m4 \
|
||||
import/m4/getprogname.m4 \
|
||||
import/m4/wchar_t.m4 \
|
||||
import/m4/isnand.m4 \
|
||||
import/m4/double-slash-root.m4 \
|
||||
import/m4/malloca.m4 \
|
||||
import/m4/fcntl.m4 \
|
||||
import/m4/frexpl.m4 \
|
||||
import/m4/strerror.m4 \
|
||||
import/m4/glob_h.m4 \
|
||||
import/m4/tempname.m4 \
|
||||
import/m4/memmem.m4 \
|
||||
import/m4/mbstate_t.m4
|
||||
|
||||
$(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps)
|
||||
include $(srcdir)/aclocal-m4-deps.mk
|
||||
|
||||
$(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ configure.ac $(aclocal_m4_deps)
|
||||
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
||||
|
||||
AUTOCONF = autoconf
|
||||
|
|
|
|||
|
|
@ -0,0 +1,136 @@
|
|||
# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro:
|
||||
aclocal_m4_deps = \
|
||||
import/m4/flexmember.m4 \
|
||||
import/m4/eealloc.m4 \
|
||||
import/m4/mkdir.m4 \
|
||||
import/m4/close.m4 \
|
||||
import/m4/unistd-safer.m4 \
|
||||
import/m4/inttypes-pri.m4 \
|
||||
import/m4/chdir-long.m4 \
|
||||
import/m4/gnulib-common.m4 \
|
||||
import/m4/readdir.m4 \
|
||||
import/m4/stdlib_h.m4 \
|
||||
import/m4/getlogin_r.m4 \
|
||||
import/m4/warn-on-use.m4 \
|
||||
import/m4/getdtablesize.m4 \
|
||||
import/m4/rewinddir.m4 \
|
||||
import/m4/string_h.m4 \
|
||||
import/m4/closedir.m4 \
|
||||
import/m4/canonicalize.m4 \
|
||||
import/m4/stdio_h.m4 \
|
||||
import/m4/fdopendir.m4 \
|
||||
import/m4/getcwd-abort-bug.m4 \
|
||||
import/m4/alloca.m4 \
|
||||
import/m4/strstr.m4 \
|
||||
import/m4/stat-time.m4 \
|
||||
import/m4/builtin-expect.m4 \
|
||||
import/m4/rawmemchr.m4 \
|
||||
import/m4/msvc-nothrow.m4 \
|
||||
import/m4/absolute-header.m4 \
|
||||
import/m4/isnanl.m4 \
|
||||
import/m4/stddef_h.m4 \
|
||||
import/m4/gnulib-tool.m4 \
|
||||
import/m4/realloc.m4 \
|
||||
import/m4/d-type.m4 \
|
||||
import/m4/frexp.m4 \
|
||||
import/m4/getcwd-path-max.m4 \
|
||||
import/m4/dup2.m4 \
|
||||
import/m4/strtok_r.m4 \
|
||||
import/m4/exponentd.m4 \
|
||||
import/m4/std-gnu11.m4 \
|
||||
import/m4/locale-ja.m4 \
|
||||
import/m4/gettimeofday.m4 \
|
||||
import/m4/time_h.m4 \
|
||||
import/m4/malloc.m4 \
|
||||
import/m4/fnmatch_h.m4 \
|
||||
import/m4/codeset.m4 \
|
||||
import/m4/getcwd.m4 \
|
||||
import/m4/readlink.m4 \
|
||||
import/m4/locale-zh.m4 \
|
||||
import/m4/stdint.m4 \
|
||||
import/m4/memrchr.m4 \
|
||||
import/m4/onceonly.m4 \
|
||||
import/m4/pathmax.m4 \
|
||||
import/m4/rename.m4 \
|
||||
import/m4/rmdir.m4 \
|
||||
import/m4/dup.m4 \
|
||||
import/m4/errno_h.m4 \
|
||||
import/m4/mbrtowc.m4 \
|
||||
import/m4/environ.m4 \
|
||||
import/m4/wchar_h.m4 \
|
||||
import/m4/strchrnul.m4 \
|
||||
import/m4/fcntl_h.m4 \
|
||||
import/m4/getpagesize.m4 \
|
||||
import/m4/largefile.m4 \
|
||||
import/m4/openat.m4 \
|
||||
import/m4/save-cwd.m4 \
|
||||
import/m4/stat.m4 \
|
||||
import/m4/include_next.m4 \
|
||||
import/m4/mmap-anon.m4 \
|
||||
import/m4/mode_t.m4 \
|
||||
import/m4/exponentl.m4 \
|
||||
import/m4/sys_types_h.m4 \
|
||||
import/m4/fcntl-o.m4 \
|
||||
import/m4/stdbool.m4 \
|
||||
import/m4/float_h.m4 \
|
||||
import/m4/msvc-inval.m4 \
|
||||
import/m4/wctype_h.m4 \
|
||||
import/m4/gnulib-cache.m4 \
|
||||
import/m4/mbsrtowcs.m4 \
|
||||
import/m4/limits-h.m4 \
|
||||
import/m4/locale-fr.m4 \
|
||||
import/m4/fstatat.m4 \
|
||||
import/m4/inttypes.m4 \
|
||||
import/m4/memchr.m4 \
|
||||
import/m4/glob.m4 \
|
||||
import/m4/fstat.m4 \
|
||||
import/m4/sys_stat_h.m4 \
|
||||
import/m4/off_t.m4 \
|
||||
import/m4/strdup.m4 \
|
||||
import/m4/ssize_t.m4 \
|
||||
import/m4/math_h.m4 \
|
||||
import/m4/unistd_h.m4 \
|
||||
import/m4/fpieee.m4 \
|
||||
import/m4/mempcpy.m4 \
|
||||
import/m4/wint_t.m4 \
|
||||
import/m4/d-ino.m4 \
|
||||
import/m4/setenv.m4 \
|
||||
import/m4/open-cloexec.m4 \
|
||||
import/m4/longlong.m4 \
|
||||
import/m4/multiarch.m4 \
|
||||
import/m4/filenamecat.m4 \
|
||||
import/m4/gnulib-comp.m4 \
|
||||
import/m4/mkstemp.m4 \
|
||||
import/m4/dirfd.m4 \
|
||||
import/m4/getlogin.m4 \
|
||||
import/m4/signal_h.m4 \
|
||||
import/m4/sys_socket_h.m4 \
|
||||
import/m4/dirname.m4 \
|
||||
import/m4/00gnulib.m4 \
|
||||
import/m4/dirent_h.m4 \
|
||||
import/m4/opendir.m4 \
|
||||
import/m4/error.m4 \
|
||||
import/m4/extensions.m4 \
|
||||
import/m4/fchdir.m4 \
|
||||
import/m4/mbsinit.m4 \
|
||||
import/m4/__inline.m4 \
|
||||
import/m4/extern-inline.m4 \
|
||||
import/m4/fnmatch.m4 \
|
||||
import/m4/lstat.m4 \
|
||||
import/m4/nocrash.m4 \
|
||||
import/m4/sys_time_h.m4 \
|
||||
import/m4/localcharset.m4 \
|
||||
import/m4/open.m4 \
|
||||
import/m4/localtime-buffer.m4 \
|
||||
import/m4/getprogname.m4 \
|
||||
import/m4/wchar_t.m4 \
|
||||
import/m4/isnand.m4 \
|
||||
import/m4/double-slash-root.m4 \
|
||||
import/m4/malloca.m4 \
|
||||
import/m4/fcntl.m4 \
|
||||
import/m4/frexpl.m4 \
|
||||
import/m4/strerror.m4 \
|
||||
import/m4/glob_h.m4 \
|
||||
import/m4/tempname.m4 \
|
||||
import/m4/memmem.m4 \
|
||||
import/m4/mbstate_t.m4
|
||||
|
|
@ -167,3 +167,13 @@ if [ $? -ne 0 ]; then
|
|||
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" | sed 's/^/\t/; s/$/ \\/; $s/ \\//g')
|
||||
EOF
|
||||
|
||||
../../move-if-change ${ACLOCAL_M4_DEPS_FILE}.tmp ${ACLOCAL_M4_DEPS_FILE}
|
||||
rm -f ${ACLOCAL_M4_DEPS_FILE}.tmp
|
||||
|
|
|
|||
Loading…
Reference in New Issue