Makefile.am (check-am): Do not override.

2003-06-30  Phil Edwards  <pme@gcc.gnu.org>

	* testsuite/Makefile.am (check-am):  Do not override.
	(baseline_symbols):  Declare as PHONY, so no need to 'touch' it.
	* testsuite/Makefile.in:  Regenerate.

From-SVN: r68738

3 files changed, 24 insertions, 33 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b9948e..65b0cd9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-30  Phil Edwards  <pme@gcc.gnu.org>
+
+	* testsuite/Makefile.am (check-am):  Do not override.
+	(baseline_symbols):  Declare as PHONY, so no need to 'touch' it.
+	* testsuite/Makefile.in:  Regenerate.
+
 2003-06-30  Doug Gregor <dgregor@apple.com> 
 	
 	* testsuite/24_iterators/insert_iterator.cc (test01, test02):
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index cd6245b..74cb500 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -78,11 +78,7 @@ else
 stamp_wchar:
 endif
 
-# Override this so local rules are possible.
-check-am: 
-	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU; \
-	$(MAKE) $(AM_MAKEFLAGS) check-local 
-
+# This is automatically run after the generated check-DEJAGNU rule.
 check-local: check-abi
 
 baseline_dir = @baseline_dir@
@@ -98,8 +94,7 @@ baseline_symbols:
 	    echo "Baseline file doesn't exist."; \
 	    echo "Try 'make new-abi-baseline' to create it."; \
 	    exit 1; \
-	  fi; \
-	touch baseline_symbols)
+	  fi; true)
 
 new-abi-baseline: 
 	-@$(mkinstalldirs) ${baseline_dir}
@@ -152,6 +147,8 @@ check-performance: ${performance_script}
 	-@(chmod + ${performance_script}; \
 	  ${performance_script} ${glibcpp_srcdir} ${glibcpp_builddir})
 
+.PHONY: baseline_symbols new-abi-baseline check-abi check-abi-verbose \
+check-script check-script-install check-performance
 
 # By adding these files here, automake will remove them for 'make clean'
 CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index ae6a4e2..f0853cc 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -141,14 +141,10 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 DEJATOOL = libstdc++-v3
 
-EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
-            echo @glibcpp_builddir@/../../expect/expect ; \
-          else echo expect ; fi`
+EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then             echo @glibcpp_builddir@/../../expect/expect ;           else echo expect ; fi`
 
 
-RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
-	       echo @glibcpp_srcdir@/../dejagnu/runtest ; \
-	    else echo runtest; fi`
+RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then 	       echo @glibcpp_srcdir@/../dejagnu/runtest ; 	    else echo runtest; fi`
 
 
 AM_RUNTESTFLAGS = 
@@ -159,23 +155,18 @@ glibcpp_builddir = @glibcpp_builddir@
 testsuite_flags_script = ${glibcpp_builddir}/scripts/testsuite_flags
 CXX = `${testsuite_flags_script} --build-cxx`
 
-CXXLINK = \
-	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
-	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK =  	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) 	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
 
 GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
-INCLUDES = \
-	-nostdinc++ \
-	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
+INCLUDES =  	-nostdinc++ 	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
 
 
 noinst_LIBRARIES = libv3test.a
 libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
-@GLIBCPP_TEST_ABI_TRUE@noinst_PROGRAMS = @GLIBCPP_TEST_ABI_TRUE@abi_check
+@GLIBCPP_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check
 @GLIBCPP_TEST_ABI_FALSE@noinst_PROGRAMS = 
 abi_check_SOURCES = abi_check.cc
 
@@ -197,8 +188,7 @@ survey_script = ${glibcpp_builddir}/scripts/check_survey
 performance_script = ${glibcpp_srcdir}/scripts/check_performance
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
-	     testsuite_* site.exp abi_check baseline_symbols 
+CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum 	     testsuite_* site.exp abi_check baseline_symbols 
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -228,7 +218,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
 OBJECTS = $(libv3test_a_OBJECTS) $(abi_check_OBJECTS)
@@ -339,7 +329,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -396,7 +386,7 @@ site.exp: Makefile
 	@echo 'set build_alias $(build_alias)' >> $@-t
 	@echo 'set build_triplet $(build_triplet)' >> $@-t
 	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+	@test ! -f $(srcdir)/site.exp || sed '1,/^## All variables above are.*##/ d' $(srcdir)/site.exp >> $@-t
 	@test ! -f site.exp || mv site.exp site.bak
 	@mv $@-t site.exp
 info-am:
@@ -489,11 +479,7 @@ all-local: stamp_wchar
 @GLIBCPP_TEST_WCHAR_T_TRUE@	touch testsuite_wchar_t
 @GLIBCPP_TEST_WCHAR_T_FALSE@stamp_wchar:
 
-# Override this so local rules are possible.
-check-am: 
-	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU; \
-	$(MAKE) $(AM_MAKEFLAGS) check-local 
-
+# This is automatically run after the generated check-DEJAGNU rule.
 check-local: check-abi
 
 current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
@@ -505,8 +491,7 @@ baseline_symbols:
 	    echo "Baseline file doesn't exist."; \
 	    echo "Try 'make new-abi-baseline' to create it."; \
 	    exit 1; \
-	  fi; \
-	touch baseline_symbols)
+	  fi; true)
 
 new-abi-baseline: 
 	-@$(mkinstalldirs) ${baseline_dir}
@@ -541,6 +526,9 @@ check-performance: ${performance_script}
 	-@(chmod + ${performance_script}; \
 	  ${performance_script} ${glibcpp_srcdir} ${glibcpp_builddir})
 
+.PHONY: baseline_symbols new-abi-baseline check-abi check-abi-verbose \
+check-script check-script-install check-performance
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: