Makefile.am (GLIBCXX_INCLUDES): Add.

2004-10-25  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/Makefile.am (GLIBCXX_INCLUDES): Add.
	(AUTOMAKE_OPTIONS): Add nostdinc.
	* testsuite/Makefile.in: Regenerate.
	* scripts/testsuite_flags.in (build-includes): Remove redundant
	search for libsupc++.
	* fragment.am: Clean.

From-SVN: r89550

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8ef259f24cae141dee97d110612256bb82c62c5b..a60d1b476438dc5cb539cc36ab022874c1c6a4a9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-25  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/Makefile.am (GLIBCXX_INCLUDES): Add.
+       (AUTOMAKE_OPTIONS): Add nostdinc.
+       * testsuite/Makefile.in: Regenerate.
+       * scripts/testsuite_flags.in (build-includes): Remove redundant
+       search for libsupc++.
+       * fragment.am: Clean.
+       
 2004-10-25  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/Makefile.am (tr1_headers): Add tuple.

diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am
index d0d03a28f7b482ba13fd97bd13305a9044e9edcb..3506dd27adf1c669a446d38fafab3b4f5e5a1e4c 100644 (file)
--- a/libstdc++-v3/fragment.am
+++ b/libstdc++-v3/fragment.am
@@ -20,7 +20,3 @@ WARN_CXXFLAGS = \
 # -I/-D flags to pass when compiling.
 AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 
-
-
-
-## vim:ft=automake

diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in
index 2a74f4782db4def3e1b1db788bb153bec47355bf..392072f175c5e5cc44e36b4b379e67db584560b8 100755 (executable)
--- a/libstdc++-v3/scripts/testsuite_flags.in
+++ b/libstdc++-v3/scripts/testsuite_flags.in
@@ -33,7 +33,7 @@ case ${query} in
       echo ${INCLUDES}
       ;;
     --build-includes)
-      INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@ -I${SRC_DIR}/libsupc++ 
+      INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@ 
                 -I${SRC_DIR}/include/backward -I${SRC_DIR}/testsuite"
       echo ${INCLUDES}
       ;;

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index a003497ecaf7d78f16456cbb21e72158cc4e55cf..371ab72e43d0aeee33fe111150a0b2eca299a5d6 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS = dejagnu nostdinc
 
 include $(top_srcdir)/fragment.am
 
@@ -31,6 +31,7 @@ AM_RUNTESTFLAGS =
 ## CXX is actually a "C" compiler. These are real C++ programs.
 testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
 CXX         = $(shell ${testsuite_flags_script} --build-cxx)
+GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes)
 AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags)
 
 GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 1005b34e58d2c52ef6ef7a9d3ed9850174e4df37..018e26f938ce483b761d7b57c85d6207d1b861dd 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -65,7 +65,7 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_abi_check_OBJECTS = abi_check.$(OBJEXT)
 abi_check_OBJECTS = $(am_abi_check_OBJECTS)
 abi_check_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = 
 depcomp =
 am__depfiles_maybe =
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -143,7 +143,7 @@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@
 GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
 GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@
 GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@
-GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
+GLIBCXX_INCLUDES = $(shell ${testsuite_flags_script} --build-includes)
 GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
 GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
 GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@
@@ -249,7 +249,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 toplevel_srcdir = @toplevel_srcdir@
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS = dejagnu nostdinc
 MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 PWD_COMMAND = $${PWDCMD-pwd}