X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7d424de14c0385012d328642bec6874c8e6cef17..bdf66d1db4b82872076197998ddcfafbed306268:/tests/local.mk?ds=sidebyside

diff --git a/tests/local.mk b/tests/local.mk
index 768c7020..18734f37 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,7 +1,6 @@
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-## 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite tests/package.m4
+EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite
 
 DISTCLEANFILES       += tests/atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES += $(TESTSUITE)
@@ -26,8 +25,8 @@ MAINTAINERCLEANFILES += $(TESTSUITE)
 ## ------------ ##
 
 $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
-	rm -f $@ $@.tmp
-	{ \
+	$(AM_V_GEN)rm -f $@ $@.tmp
+	$(AM_V_at){ \
 	  echo '# Signature of the current package.'; \
 	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \
 	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])'; \
@@ -35,33 +34,36 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
 	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])'; \
 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
 	} >$@.tmp
-	mv $@.tmp $@
+	$(AM_V_at)mv $@.tmp $@
 
 ## ------------ ##
 ## Test suite.  ##
 ## ------------ ##
 
-TESTSUITE_AT =					\
-  tests/actions.at				\
-  tests/c++.at					\
-  tests/calc.at					\
-  tests/conflicts.at				\
-  tests/cxx-type.at				\
-  tests/existing.at				\
-  tests/glr-regression.at			\
-  tests/headers.at				\
-  tests/input.at				\
-  tests/java.at					\
-  tests/local.at				\
-  tests/named-refs.at				\
-  tests/output.at				\
-  tests/push.at					\
-  tests/reduce.at				\
-  tests/regression.at				\
-  tests/sets.at					\
-  tests/skeletons.at				\
-  tests/synclines.at				\
-  tests/testsuite.at				\
+## Leave testsuite.at first for the "testsuite" rule's $<.
+TESTSUITE_AT =                                  \
+  tests/testsuite.at                            \
+                                                \
+  tests/actions.at                              \
+  tests/c++.at                                  \
+  tests/calc.at                                 \
+  tests/conflicts.at                            \
+  tests/cxx-type.at                             \
+  tests/existing.at                             \
+  tests/glr-regression.at                       \
+  tests/headers.at                              \
+  tests/input.at                                \
+  tests/java.at                                 \
+  tests/local.at                                \
+  tests/named-refs.at                           \
+  tests/output.at                               \
+  tests/package.m4                              \
+  tests/push.at                                 \
+  tests/reduce.at                               \
+  tests/regression.at                           \
+  tests/sets.at                                 \
+  tests/skeletons.at                            \
+  tests/synclines.at                            \
   tests/torture.at
 
 TESTSUITE = $(top_srcdir)/tests/testsuite
@@ -69,9 +71,9 @@ RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests
-$(TESTSUITE): $(top_srcdir)/tests/package.m4 $(TESTSUITE_AT)
-	$(AUTOTEST) $(AUTOTESTFLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
-	mv $@.tmp $@
+$(TESTSUITE): $(TESTSUITE_AT)
+	$(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
 clean-local: clean-local-tests
 clean-local-tests: