2003-08-17 Phil Edwards <pme@gcc.gnu.org>

	* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES):  Remove LIBMATH_INCLUDES
	and LIBSUPCXX_INCLUDES.  Re-purpose TOPLEVEL_INCLUDES to refer to
	things from the top level.
	* configure.ac (GLIBCXX_IS_NATIVE):  Determine earlier and re-order.
	Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
	(currently unused).  Strip the fake-VPATH shell fragment from
	automake-generated rules, if present.
	* linkage.m4:  Add comment.

	* fragment.am:  New file, containing factored-out common settings.
	(AM_CPPFLAGS):  Absorb the deprecated INCLUDES variable contents.
	* Makefile.am:  Include fragment.am.  Remove common variables.
	* include/Makefile.am:  Likewise.
	* libmath/Makefile.am:  Likewise.
	* libsupc++/Makefile.am:  Likewise.
	* po/Makefile.am:  Likewise.  Print rules during check.
	* src/Makefile.am:  Likewise.
	* testsuite/Makefile.am:  Likewise.

	* aclocal.m4, configure, Makefile.in, include/Makefile.in,
	libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
	src/Makefile.in, testsuite/Makefile.in:  Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70522 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 8 insertions, 19 deletions

diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
index fbd0bfeb0fd..0902e9e3ed9 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the po subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 2001 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2003 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -21,11 +21,8 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-PACKAGE = @PACKAGE@
-glibcxx_srcdir = @glibcxx_srcdir@
 
 # Location of installation directories.
-mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 locale_installdir = $(DESTDIR)$(datadir)/locale
 locale_builddir = @glibcxx_localedir@
 
@@ -53,8 +50,8 @@ all-local-yes: $(LOCALE_OUT)
 check: check-@USE_NLS@
 check-no:
 check-yes:
-	@$(mkinstalldirs) $(locale_builddir) 
-	@catalogs='$(LOCALE_OUT)'; \
+	$(mkinstalldirs) $(locale_builddir) 
+	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
@@ -69,7 +66,7 @@ install-data-local: install-data-local-@USE_NLS@
 install-data-local-no:
 install-data-local-yes: all-local-yes
 	$(mkinstalldirs) $(locale_installdir) 
-	@catalogs='$(LOCALE_OUT)'; \
+	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index d51c7ad5546..8c785d34cf6 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -49,8 +49,6 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASIC_FILE_CC = @BASIC_FILE_CC@
 BASIC_FILE_H = @BASIC_FILE_H@
-CANADIAN_FALSE = @CANADIAN_FALSE@
-CANADIAN_TRUE = @CANADIAN_TRUE@
 CC = @CC@
 CCODECVT_CC = @CCODECVT_CC@
 CCODECVT_H = @CCODECVT_H@
@@ -86,8 +84,6 @@ FPOS_H = @FPOS_H@
 FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
 GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
-GLIBCXX_BUILD_LIBMATH_FALSE = @GLIBCXX_BUILD_LIBMATH_FALSE@
-GLIBCXX_BUILD_LIBMATH_TRUE = @GLIBCXX_BUILD_LIBMATH_TRUE@
 GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
 GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
 GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
@@ -107,12 +103,9 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
 LIBMATHOBJS = @LIBMATHOBJS@
-LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LIBUNWIND_FLAG = @LIBUNWIND_FLAG@
@@ -126,7 +119,6 @@ OBJEXT = @OBJEXT@
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 OPT_LDFLAGS = @OPT_LDFLAGS@
 OS_INC_SRCDIR = @OS_INC_SRCDIR@
-
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -205,7 +197,6 @@ target_vendor = @target_vendor@
 toplevel_srcdir = @toplevel_srcdir@
 
 # Location of installation directories.
-mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 locale_installdir = $(DESTDIR)$(datadir)/locale
 locale_builddir = @glibcxx_localedir@
 
@@ -227,6 +218,7 @@ DISTFILES = \
 CLEANFILES = $(LOCALE_OUT) 
 subdir = po
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 depcomp =
@@ -385,8 +377,8 @@ all-local-yes: $(LOCALE_OUT)
 check: check-@USE_NLS@
 check-no:
 check-yes:
-	@$(mkinstalldirs) $(locale_builddir) 
-	@catalogs='$(LOCALE_OUT)'; \
+	$(mkinstalldirs) $(locale_builddir) 
+	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
@@ -401,7 +393,7 @@ install-data-local: install-data-local-@USE_NLS@
 install-data-local-no:
 install-data-local-yes: all-local-yes
 	$(mkinstalldirs) $(locale_installdir) 
-	@catalogs='$(LOCALE_OUT)'; \
+	catalogs='$(LOCALE_OUT)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.mo$$//'`; \