diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2023-04-11 21:40:14 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-05-08 15:51:59 +0200 |
commit | 8b8a4fb8eff662554207e2ba9ed6afb0f6c5abaf (patch) | |
tree | f609b1103325d2c02100fdac7352911bbdc96f75 | |
parent | 06ef1583d68169d1a002f5e86189462bb748963c (diff) | |
download | gcc-8b8a4fb8eff662554207e2ba9ed6afb0f6c5abaf.zip gcc-8b8a4fb8eff662554207e2ba9ed6afb0f6c5abaf.tar.gz gcc-8b8a4fb8eff662554207e2ba9ed6afb0f6c5abaf.tar.bz2 |
libgm2: Adjust 'autogen.sh' to 'ACLOCAL_AMFLAGS', and simplify
Specifying explicit '-I ..' before '-I ../config' is what (most) other GCC
components do. Specifying '-I .' is not necessary.
With the order of '-I's aligned, 'autogen.sh' and plain 'autoreconf' then
produce identical results.
libgm2/
* autogen.sh: For 'aclocal', 'autoreconf', remove '-I .',
add '-I ..'.
* Makefile.am (ACLOCAL_AMFLAGS): Remove '-I .'.
* libm2cor/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
* libm2iso/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
* libm2log/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
* libm2min/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
* libm2pim/Makefile.am (ACLOCAL_AMFLAGS): Likewise.
* aclocal.m4: Regenerate.
* Makefile.in: Likewise.
* libm2cor/Makefile.in: Likewise.
* libm2iso/Makefile.in: Likewise.
* libm2log/Makefile.in: Likewise.
* libm2min/Makefile.in: Likewise.
* libm2pim/Makefile.in: Likewise.
-rw-r--r-- | libgm2/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/Makefile.in | 12 | ||||
-rw-r--r-- | libgm2/aclocal.m4 | 10 | ||||
-rwxr-xr-x | libgm2/autogen.sh | 5 | ||||
-rw-r--r-- | libgm2/libm2cor/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/libm2cor/Makefile.in | 12 | ||||
-rw-r--r-- | libgm2/libm2iso/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/libm2iso/Makefile.in | 12 | ||||
-rw-r--r-- | libgm2/libm2log/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/libm2log/Makefile.in | 12 | ||||
-rw-r--r-- | libgm2/libm2min/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/libm2min/Makefile.in | 12 | ||||
-rw-r--r-- | libgm2/libm2pim/Makefile.am | 2 | ||||
-rw-r--r-- | libgm2/libm2pim/Makefile.in | 12 |
14 files changed, 49 insertions, 50 deletions
diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am index 0b593f6..95df3ed 100644 --- a/libgm2/Makefile.am +++ b/libgm2/Makefile.am @@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign SUFFIXES = .c .mod .def .o .obj .lo .a -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES= diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in index da2ec7c..d995006 100644 --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -90,15 +90,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@ # Modula-2 support. AUTOMAKE_OPTIONS = 1.8 foreign SUFFIXES = .c .mod .def .o .obj .lo .a -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libgm2/aclocal.m4 b/libgm2/aclocal.m4 index c352303..832065f 100644 --- a/libgm2/aclocal.m4 +++ b/libgm2/aclocal.m4 @@ -1187,14 +1187,14 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../libtool.m4]) -m4_include([../ltoptions.m4]) -m4_include([../ltsugar.m4]) -m4_include([../ltversion.m4]) -m4_include([../lt~obsolete.m4]) m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/multi.m4]) m4_include([../config/no-executables.m4]) m4_include([../config/override.m4]) +m4_include([../libtool.m4]) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) diff --git a/libgm2/autogen.sh b/libgm2/autogen.sh index ea0ef76..1b14497 100755 --- a/libgm2/autogen.sh +++ b/libgm2/autogen.sh @@ -21,9 +21,8 @@ rm -rf autom4te.cache # libtoolize rm -f aclocal.m4 -# aclocal -I . -I config -I ../config -aclocal -I . -I ../config -autoreconf -I . -I ../config +aclocal -I .. -I ../config +autoreconf -I .. -I ../config automake --include-deps rm -rf autom4te.cache diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index 8e68272..48de40c 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -17,7 +17,7 @@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-coroutines diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index f92dd941..9d643d5 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -107,15 +107,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = libm2cor ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index dddced4..d48ef06 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -17,7 +17,7 @@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-iso diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index e28e9dd..b8936e7 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -107,15 +107,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = libm2iso ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -409,7 +409,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am index c38ec3c..a15747f 100644 --- a/libgm2/libm2log/Makefile.am +++ b/libgm2/libm2log/Makefile.am @@ -17,7 +17,7 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-log diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index ef43b0d..fa98b1d 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -107,15 +107,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = libm2log ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index 4d6203a..1ff1600 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -17,7 +17,7 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@/../../gcc/m2/gm2-libs-min diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index 673d6d5..1c0bebd 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -107,15 +107,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = libm2min ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -363,7 +363,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index 5304268..ebfeba1 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -17,7 +17,7 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index b77a628..e5a9797 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -107,15 +107,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = libm2pim ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ - $(top_srcdir)/../config/override.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -398,7 +398,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUFFIXES = .c .mod .def .o .obj .lo .a .la -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config # Multilib support. MAKEOVERRIDES = |