From f8b17f0f7b126b271d6067647ca6046c4f678c4c Mon Sep 17 00:00:00 2001 From: kcook Date: Wed, 6 Apr 2005 00:05:51 +0000 Subject: 2005-04-05 Kelley Cook * Makefile.am (ACLOCAL_AMFLAGS): Define. * crossconfig.m4: Wrap file into new GLIBCXX_CROSSCONFIG macro. * configure.ac: Use it. * acinclude.m4: Delete explicit m4_includes and sincludes. * aclocal.m4, configure, Makefile.in, po/Makefile.in, src/Makefile.in, include/Makefile.in, libmath/Makefile.in, testsuite/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97677 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 12 +++++++++++- libstdc++-v3/Makefile.am | 2 ++ libstdc++-v3/Makefile.in | 6 +++--- libstdc++-v3/acinclude.m4 | 14 -------------- libstdc++-v3/aclocal.m4 | 4 ++++ libstdc++-v3/configure | 1 - libstdc++-v3/configure.ac | 2 +- libstdc++-v3/crossconfig.m4 | 3 ++- libstdc++-v3/include/Makefile.in | 5 ++--- libstdc++-v3/libmath/Makefile.in | 5 ++--- libstdc++-v3/libsupc++/Makefile.in | 5 ++--- libstdc++-v3/po/Makefile.in | 5 ++--- libstdc++-v3/src/Makefile.in | 5 ++--- libstdc++-v3/testsuite/Makefile.in | 5 ++--- 14 files changed, 35 insertions(+), 39 deletions(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7461bd1e318..80a7f32100e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2005-04-05 Kelley Cook + + * Makefile.am (ACLOCAL_AMFLAGS): Define. + * crossconfig.m4: Wrap file into new GLIBCXX_CROSSCONFIG macro. + * configure.ac: Use it. + * acinclude.m4: Delete explicit m4_includes and sincludes. + * aclocal.m4, configure, Makefile.in, po/Makefile.in, + src/Makefile.in, include/Makefile.in, libmath/Makefile.in, + testsuite/Makefile.in: Regenerate. + 2005-04-05 Jonathan Wakely * include/tr1/memory, include/tr1/boost_shared_ptr.h: Use mutex @@ -23,7 +33,7 @@ 2005-04-05 Kelley Cook - * acconfig.h: Delete macros already ACDEFINED. + * acconfig.h: Delete macros already AC_DEFINED. * config.h.in: Regenerate. 2005-04-05 Kelley Cook diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 89fe901cf72..bccacb65f78 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -30,6 +30,8 @@ endif ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. SUBDIRS = include libsupc++ $(hosted_source) +ACLOCAL_AMFLAGS = -I . -I .. -I ../config + # These rules are messy, but are hella worth it. doxygen: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 2d03aa9e6b5..0cf5e061596 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -46,10 +46,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ $(top_srcdir)/scripts/testsuite_flags.in ChangeLog acconfig.h subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -275,6 +274,7 @@ WARN_CXXFLAGS = \ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) @GLIBCXX_HOSTED_TRUE@hosted_source = libmath src po testsuite SUBDIRS = include libsupc++ $(hosted_source) +ACLOCAL_AMFLAGS = -I . -I .. -I ../config # Multilib support. MAKEOVERRIDES = diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 92ce9a238ec..d911e2f8032 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -131,10 +131,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ ]) -m4_include([linkage.m4]) -m4_include([../config/no-executables.m4]) - - dnl dnl Tests for newer compiler features, or features that are present in newer dnl compiler versions but not older compiler versions still in use, should @@ -1820,14 +1816,4 @@ AC_DEFUN([AC_LC_MESSAGES], [ ]) -sinclude([../libtool.m4]) -dnl The lines below arrange for aclocal not to bring an installed -dnl libtool.m4 into aclocal.m4, while still arranging for automake to -dnl add a definition of LIBTOOL to Makefile.in. -ifelse(,,,[AC_SUBST(LIBTOOL) -AC_DEFUN([AM_PROG_LIBTOOL]) -AC_DEFUN([AC_LIBTOOL_DLOPEN]) -AC_DEFUN([AC_PROG_LD]) -]) - dnl vim:et:ts=2:sw=2 diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 0111a59f978..7dda07cdfd0 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -817,4 +817,8 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/no-executables.m4]) +m4_include([../libtool.m4]) +m4_include([crossconfig.m4]) +m4_include([linkage.m4]) m4_include([acinclude.m4]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 908fada25a8..778483ec105 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -86504,7 +86504,6 @@ echo "$as_me: error: No support for this host/target combination." >&2;} ;; esac - fi # At some point, we should differentiate between architectures diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index f2271c17406..8d2844ad86b 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -222,7 +222,7 @@ else AC_DEFINE(HAVE_S_ISREG) AC_DEFINE(HAVE_S_IFREG) else - m4_include([crossconfig.m4]) + GLIBCXX_CROSSCONFIG fi # At some point, we should differentiate between architectures diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4 index 598a5de4558..200aa6275cc 100644 --- a/libstdc++-v3/crossconfig.m4 +++ b/libstdc++-v3/crossconfig.m4 @@ -2,6 +2,7 @@ dnl dnl This file contains details for non-natives builds. dnl +AC_DEFUN([GLIBCXX_CROSSCONFIG],[ # Base decisions on target environment. case "${host}" in arm*-*-symbianelf*) @@ -477,4 +478,4 @@ case "${host}" in AC_MSG_ERROR([No support for this host/target combination.]) ;; esac - +]) diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index ddd636c9eac..66c3899f7ae 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -40,10 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/fragment.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 5e6e5adefd1..fa6a32eea9f 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -42,10 +42,9 @@ target_triplet = @target@ subdir = libmath DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 6bf437166f3..93c8d09f273 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -44,10 +44,9 @@ DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/fragment.am subdir = libsupc++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index a402a67515f..cc0937f1384 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -40,10 +40,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/fragment.am subdir = po ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 1770a5dcb3b..c3729ca53ca 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -42,10 +42,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/fragment.am subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index c96fabc6707..77ac3c2ad1c 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -43,10 +43,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/fragment.am subdir = testsuite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/linkage.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \ + $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -- cgit v1.2.1