Remove indirection in stdio-common tests dependencies.

stdio-common/Makefile has the tests target depend on two test output
files indirectly through rules do-tst-unbputc and do-tst-printf.  I
see no reason for such an indirection, and everywhere else the tests
just depend on the output files directly, so this patch removes the
indirection.

Tested x86_64.

	* stdio-common/Makefile (do-tst-unbputc): Remove target.
	(do-tst-printf): Likewise.
	(tests): Depend directly on $(objpfx)tst-unbputc.out and
	$(objpfx)tst-printf.out.

diff --git a/ChangeLog b/ChangeLog
index 006ca7d..40ff844 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-02-12  Joseph Myers  <joseph@codesourcery.com>
 
+       * stdio-common/Makefile (do-tst-unbputc): Remove target.
+       (do-tst-printf): Likewise.
+       (tests): Depend directly on $(objpfx)tst-unbputc.out and
+       $(objpfx)tst-printf.out.
+
        * io/ftwtest-sh (testout): Change to $tmp/ftwtest-tmp.out.
 
        * Makerules (check-abi-%): Change target to

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 76eccb0..fb35f43 100644 (file)
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -64,14 +64,11 @@ test-srcs = tst-unbputc tst-printf
 include ../Rules
 
 ifeq ($(run-built-tests),yes)
-.PHONY: do-tst-unbputc do-tst-printf
-tests: do-tst-unbputc do-tst-printf
+tests: $(objpfx)tst-unbputc.out $(objpfx)tst-printf.out
 
-do-tst-unbputc: $(objpfx)tst-unbputc.out
 $(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
        $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
 
-do-tst-printf: $(objpfx)tst-printf.out
 $(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf
        $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
 endif