diff options
| author | Phil Edwards <pme@gcc.gnu.org> | 2003-08-17 20:23:12 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2003-08-17 20:23:12 +0000 |
| commit | 0df3f383efc37b6b0d231f38b713d3aa7beef609 (patch) | |
| tree | bc40445978d8406152440975e0c56f5763886180 /libstdc++-v3/testsuite/Makefile.am | |
| parent | dd61aa98caa43a54970c2a4eecf9c4e3f325d14e (diff) | |
| download | gcc-0df3f383efc37b6b0d231f38b713d3aa7beef609.tar.gz | |
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
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.
From-SVN: r70522
Diffstat (limited to 'libstdc++-v3/testsuite/Makefile.am')
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index ff2149efd25..4248a14fe0c 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -23,15 +23,12 @@ AUTOMAKE_OPTIONS = dejagnu -mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs +include $(top_srcdir)/fragment.am AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = -PWD_COMMAND = $${PWDCMD-pwd} ## CXX is actually a "C" compiler. These are real C++ programs. -glibcxx_srcdir=@glibcxx_srcdir@ -glibcxx_builddir=@glibcxx_builddir@ testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags CXX=`${testsuite_flags_script} --build-cxx` @@ -40,13 +37,6 @@ CXXLINK = \ $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ -LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ -TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -INCLUDES = \ - -nostdinc++ \ - @GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ - # Generated lists of files to run. All of these names are valid make # targets, if you wish to generate a list manually. lists_of_files = \ |