This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[libstdc++] Tighten up testsuite makefile rules
- From: Phil Edwards <phil at jaj dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 30 Jun 2003 16:42:52 -0400
- Subject: [libstdc++] Tighten up testsuite makefile rules
The generated check-am rule does the exact same thing as the overriding
one, so we don't need to override it. Added bonus that GNU make stops
complaining about overriding rules.
I think the only reason that the baseline_symbols rule touch'es the file
of the same name on failure is to avoid make errors, at least, that's what
I've commonly seen in the past. We can do it like this instead and avoid
the empty files.
Tested on x86/linux, applied to mainline.
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.
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/Makefile.am,v
retrieving revision 1.24
diff -u -3 -p -r1.24 Makefile.am
--- testsuite/Makefile.am 27 Jun 2003 18:13:11 -0000 1.24
+++ testsuite/Makefile.am 30 Jun 2003 20:36:16 -0000
@@ -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 \