OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate gnulib's toplevel Makefile.in using automake

Browse Source 
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
This commit is contained in:
Christian Biesinger 2019-11-14 16:17:59 -08:00
parent 71d3dc7430
commit 33bd0102c1
6 changed files with 1960 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnulib/ChangeLog
View File

@ -1,3 +1,14 @@
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.
2019-11-12 Christian Biesinger <cbiesinger@google.com>
* Makefile.in: Fix path to say import/ instead of gnulib/.

18
gnulib/Makefile.am Normal file
View File

@ -0,0 +1,18 @@
# Copyright (C) 2019 Free Software Foundation, Inc.
# This file is part of GDB.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = import

2139
gnulib/Makefile.in
View File

File diff suppressed because it is too large Load Diff

138
gnulib/aclocal-m4-deps.mk
View File

@ -1,138 +0,0 @@
# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro:
aclocal_m4_deps = \
import/m4/00gnulib.m4 \
import/m4/absolute-header.m4 \
import/m4/alloca.m4 \
import/m4/arpa_inet_h.m4 \
import/m4/canonicalize.m4 \
import/m4/chdir-long.m4 \
import/m4/close.m4 \
import/m4/closedir.m4 \
import/m4/codeset.m4 \
import/m4/configmake.m4 \
import/m4/d-ino.m4 \
import/m4/d-type.m4 \
import/m4/dirent_h.m4 \
import/m4/dirfd.m4 \
import/m4/dirname.m4 \
import/m4/double-slash-root.m4 \
import/m4/dup.m4 \
import/m4/dup2.m4 \
import/m4/eealloc.m4 \
import/m4/environ.m4 \
import/m4/errno_h.m4 \
import/m4/error.m4 \
import/m4/exponentd.m4 \
import/m4/exponentl.m4 \
import/m4/extensions.m4 \
import/m4/extern-inline.m4 \
import/m4/fchdir.m4 \
import/m4/fcntl-o.m4 \
import/m4/fcntl.m4 \
import/m4/fcntl_h.m4 \
import/m4/fdopendir.m4 \
import/m4/filenamecat.m4 \
import/m4/flexmember.m4 \
import/m4/float_h.m4 \
import/m4/fnmatch.m4 \
import/m4/fpieee.m4 \
import/m4/frexp.m4 \
import/m4/frexpl.m4 \
import/m4/fstat.m4 \
import/m4/fstatat.m4 \
import/m4/getcwd-abort-bug.m4 \
import/m4/getcwd-path-max.m4 \
import/m4/getcwd.m4 \
import/m4/getdtablesize.m4 \
import/m4/getlogin_r.m4 \
import/m4/getprogname.m4 \
import/m4/gettimeofday.m4 \
import/m4/glibc21.m4 \
import/m4/glob.m4 \
import/m4/gnulib-cache.m4 \
import/m4/gnulib-common.m4 \
import/m4/gnulib-comp.m4 \
import/m4/gnulib-tool.m4 \
import/m4/hard-locale.m4 \
import/m4/include_next.m4 \
import/m4/inet_ntop.m4 \
import/m4/inttypes-pri.m4 \
import/m4/inttypes.m4 \
import/m4/isnand.m4 \
import/m4/isnanl.m4 \
import/m4/largefile.m4 \
import/m4/limits-h.m4 \
import/m4/localcharset.m4 \
import/m4/locale-fr.m4 \
import/m4/locale-ja.m4 \
import/m4/locale-zh.m4 \
import/m4/longlong.m4 \
import/m4/lstat.m4 \
import/m4/malloc.m4 \
import/m4/malloca.m4 \
import/m4/math_h.m4 \
import/m4/mbrtowc.m4 \
import/m4/mbsinit.m4 \
import/m4/mbsrtowcs.m4 \
import/m4/mbstate_t.m4 \
import/m4/memchr.m4 \
import/m4/memmem.m4 \
import/m4/mempcpy.m4 \
import/m4/memrchr.m4 \
import/m4/mkdir.m4 \
import/m4/mkdtemp.m4 \
import/m4/mkostemp.m4 \
import/m4/mmap-anon.m4 \
import/m4/mode_t.m4 \
import/m4/msvc-inval.m4 \
import/m4/msvc-nothrow.m4 \
import/m4/multiarch.m4 \
import/m4/netinet_in_h.m4 \
import/m4/nocrash.m4 \
import/m4/off_t.m4 \
import/m4/onceonly.m4 \
import/m4/open.m4 \
import/m4/openat.m4 \
import/m4/opendir.m4 \
import/m4/pathmax.m4 \
import/m4/rawmemchr.m4 \
import/m4/readdir.m4 \
import/m4/readlink.m4 \
import/m4/realloc.m4 \
import/m4/rename.m4 \
import/m4/rewinddir.m4 \
import/m4/rmdir.m4 \
import/m4/save-cwd.m4 \
import/m4/secure_getenv.m4 \
import/m4/setenv.m4 \
import/m4/signal_h.m4 \
import/m4/socklen.m4 \
import/m4/sockpfaf.m4 \
import/m4/ssize_t.m4 \
import/m4/stat.m4 \
import/m4/stdalign.m4 \
import/m4/stdbool.m4 \
import/m4/stddef_h.m4 \
import/m4/stdint.m4 \
import/m4/stdio_h.m4 \
import/m4/stdlib_h.m4 \
import/m4/strchrnul.m4 \
import/m4/strdup.m4 \
import/m4/strerror.m4 \
import/m4/string_h.m4 \
import/m4/strstr.m4 \
import/m4/strtok_r.m4 \
import/m4/sys_socket_h.m4 \
import/m4/sys_stat_h.m4 \
import/m4/sys_time_h.m4 \
import/m4/sys_types_h.m4 \
import/m4/sys_uio_h.m4 \
import/m4/tempname.m4 \
import/m4/time_h.m4 \
import/m4/unistd-safer.m4 \
import/m4/unistd_h.m4 \
import/m4/warn-on-use.m4 \
import/m4/wchar_h.m4 \
import/m4/wchar_t.m4 \
import/m4/wctype_h.m4 \
import/m4/wint_t.m4

4
gnulib/configure.ac
View File

@ -21,6 +21,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([libgnu], [UNUSED-VERSION])
AC_CONFIG_SRCDIR([import/memmem.c])
AC_CONFIG_HEADER(config.h:config.in)
AC_CONFIG_MACRO_DIRS([import/m4])
AC_CONFIG_MACRO_DIRS([../config])
AM_MAINTAINER_MODE
AC_PROG_CC
@ -37,7 +39,7 @@ gl_INIT
# We don't use automake, but gnulib does. This line lets us generate
# its Makefile.in.
AM_INIT_AUTOMAKE([no-define])
AM_INIT_AUTOMAKE([no-define foreign])
AM_SILENT_RULES([yes])

14
gnulib/update-gnulib.sh
View File

@ -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