From 6c620880eb15473a6414901f4764daf06dc4372c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 22 Sep 2009 15:40:15 +0200 Subject: Get rid of unnecessary .PHONY declarations --- tests/cxx/parser/built-in/makefile | 5 ----- tests/cxx/parser/enumeration/makefile | 5 ----- tests/cxx/parser/generated-impl/makefile | 5 ----- tests/cxx/parser/list/makefile | 5 ----- tests/cxx/parser/makefile | 4 ---- tests/cxx/parser/name-clash/inheritance/makefile | 5 ----- tests/cxx/parser/polymorphism/makefile | 4 ---- tests/cxx/parser/polymorphism/same-type/makefile | 5 ----- tests/cxx/parser/recursive/makefile | 5 ----- tests/cxx/parser/test-template/makefile | 5 ----- tests/cxx/parser/union/makefile | 5 ----- tests/cxx/parser/validation/all/makefile | 6 ------ tests/cxx/parser/validation/any/makefile | 6 ------ tests/cxx/parser/validation/attribute/makefile | 6 ------ tests/cxx/parser/validation/built-in/any-type/makefile | 6 ------ tests/cxx/parser/validation/built-in/binary/makefile | 5 ----- tests/cxx/parser/validation/built-in/boolean/makefile | 5 ----- tests/cxx/parser/validation/built-in/byte/makefile | 5 ----- tests/cxx/parser/validation/built-in/date-time/makefile | 5 ----- tests/cxx/parser/validation/built-in/float/makefile | 5 ----- tests/cxx/parser/validation/built-in/int/makefile | 5 ----- tests/cxx/parser/validation/built-in/integer/makefile | 5 ----- tests/cxx/parser/validation/built-in/long/makefile | 5 ----- tests/cxx/parser/validation/built-in/makefile | 2 -- tests/cxx/parser/validation/built-in/qname/makefile | 5 ----- tests/cxx/parser/validation/built-in/short/makefile | 5 ----- tests/cxx/parser/validation/built-in/string/makefile | 5 ----- tests/cxx/parser/validation/built-in/uri/makefile | 5 ----- tests/cxx/parser/validation/choice/makefile | 5 ----- tests/cxx/parser/validation/makefile | 4 ---- tests/cxx/parser/validation/restriction/makefile | 6 ------ tests/cxx/parser/validation/sequence/makefile | 6 ------ 32 files changed, 160 deletions(-) (limited to 'tests/cxx/parser') diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile index 1f6b86c..d2422d1 100644 --- a/tests/cxx/parser/built-in/makefile +++ b/tests/cxx/parser/built-in/makefile @@ -38,22 +38,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile index d448a55..8ff1aef 100644 --- a/tests/cxx/parser/enumeration/makefile +++ b/tests/cxx/parser/enumeration/makefile @@ -39,22 +39,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile index f1db7ed..d968e98 100644 --- a/tests/cxx/parser/generated-impl/makefile +++ b/tests/cxx/parser/generated-impl/makefile @@ -46,22 +46,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile index 84c24a4..48e6826 100644 --- a/tests/cxx/parser/list/makefile +++ b/tests/cxx/parser/list/makefile @@ -38,22 +38,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile index 955be44..dec968c 100644 --- a/tests/cxx/parser/makefile +++ b/tests/cxx/parser/makefile @@ -5,18 +5,14 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - tests := built-in enumeration generated-impl list recursive \ name-clash/inheritance polymorphism test-template validation \ union - default := $(out_base)/ test := $(out_base)/.test clean := $(out_base)/.clean -.PHONY: $(default) $(test) $(clean) - $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile index 16f737e..6674a8b 100644 --- a/tests/cxx/parser/name-clash/inheritance/makefile +++ b/tests/cxx/parser/name-clash/inheritance/makefile @@ -39,22 +39,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile index a3c4f3e..f22c152 100644 --- a/tests/cxx/parser/polymorphism/makefile +++ b/tests/cxx/parser/polymorphism/makefile @@ -5,16 +5,12 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - tests := same-type - default := $(out_base)/ test := $(out_base)/.test clean := $(out_base)/.clean -.PHONY: $(default) $(test) $(clean) - $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) diff --git a/tests/cxx/parser/polymorphism/same-type/makefile b/tests/cxx/parser/polymorphism/same-type/makefile index ff4183d..bf627ab 100644 --- a/tests/cxx/parser/polymorphism/same-type/makefile +++ b/tests/cxx/parser/polymorphism/same-type/makefile @@ -39,22 +39,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile index 976a1b3..4d7574d 100644 --- a/tests/cxx/parser/recursive/makefile +++ b/tests/cxx/parser/recursive/makefile @@ -39,22 +39,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile index 5047b10..a0ab9e1 100644 --- a/tests/cxx/parser/test-template/makefile +++ b/tests/cxx/parser/test-template/makefile @@ -38,22 +38,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile index 538d4c1..0771e04 100644 --- a/tests/cxx/parser/union/makefile +++ b/tests/cxx/parser/union/makefile @@ -38,22 +38,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(src_base)/test.xml $(src_base)/output $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile index 1e1b33c..324cc61 100644 --- a/tests/cxx/parser/validation/all/makefile +++ b/tests/cxx/parser/validation/all/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile index 19fc057..8e66e39 100644 --- a/tests/cxx/parser/validation/any/makefile +++ b/tests/cxx/parser/validation/any/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile index d5a83a3..4141c45 100644 --- a/tests/cxx/parser/validation/attribute/makefile +++ b/tests/cxx/parser/validation/attribute/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile index 1c93b76..f0269fb 100644 --- a/tests/cxx/parser/validation/built-in/any-type/makefile +++ b/tests/cxx/parser/validation/built-in/any-type/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/built-in/binary/makefile b/tests/cxx/parser/validation/built-in/binary/makefile index 27ddeef..bab972d 100644 --- a/tests/cxx/parser/validation/built-in/binary/makefile +++ b/tests/cxx/parser/validation/built-in/binary/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/boolean/makefile b/tests/cxx/parser/validation/built-in/boolean/makefile index bf16586..ac9e9a7 100644 --- a/tests/cxx/parser/validation/built-in/boolean/makefile +++ b/tests/cxx/parser/validation/built-in/boolean/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/byte/makefile b/tests/cxx/parser/validation/built-in/byte/makefile index efe7f01..ab96263 100644 --- a/tests/cxx/parser/validation/built-in/byte/makefile +++ b/tests/cxx/parser/validation/built-in/byte/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/date-time/makefile b/tests/cxx/parser/validation/built-in/date-time/makefile index 12eb7ba..7dc3ddf 100644 --- a/tests/cxx/parser/validation/built-in/date-time/makefile +++ b/tests/cxx/parser/validation/built-in/date-time/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/float/makefile b/tests/cxx/parser/validation/built-in/float/makefile index 1a39e04..705b67b 100644 --- a/tests/cxx/parser/validation/built-in/float/makefile +++ b/tests/cxx/parser/validation/built-in/float/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/int/makefile b/tests/cxx/parser/validation/built-in/int/makefile index c626a9c..6114808 100644 --- a/tests/cxx/parser/validation/built-in/int/makefile +++ b/tests/cxx/parser/validation/built-in/int/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/integer/makefile b/tests/cxx/parser/validation/built-in/integer/makefile index 8d52dee..0ed55bb 100644 --- a/tests/cxx/parser/validation/built-in/integer/makefile +++ b/tests/cxx/parser/validation/built-in/integer/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/long/makefile b/tests/cxx/parser/validation/built-in/long/makefile index b9289b1..bbf4499 100644 --- a/tests/cxx/parser/validation/built-in/long/makefile +++ b/tests/cxx/parser/validation/built-in/long/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/makefile b/tests/cxx/parser/validation/built-in/makefile index e0728b0..45a2435 100644 --- a/tests/cxx/parser/validation/built-in/makefile +++ b/tests/cxx/parser/validation/built-in/makefile @@ -12,8 +12,6 @@ default := $(out_base)/ test := $(out_base)/.test clean := $(out_base)/.clean -.PHONY: $(default) $(test) $(clean) - $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) diff --git a/tests/cxx/parser/validation/built-in/qname/makefile b/tests/cxx/parser/validation/built-in/qname/makefile index b541239..a71e7aa 100644 --- a/tests/cxx/parser/validation/built-in/qname/makefile +++ b/tests/cxx/parser/validation/built-in/qname/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/short/makefile b/tests/cxx/parser/validation/built-in/short/makefile index 0457f13..00f1bf4 100644 --- a/tests/cxx/parser/validation/built-in/short/makefile +++ b/tests/cxx/parser/validation/built-in/short/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/string/makefile b/tests/cxx/parser/validation/built-in/string/makefile index 46b7b5f..edcef8c 100644 --- a/tests/cxx/parser/validation/built-in/string/makefile +++ b/tests/cxx/parser/validation/built-in/string/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/built-in/uri/makefile b/tests/cxx/parser/validation/built-in/uri/makefile index 1a28808..0ed0eee 100644 --- a/tests/cxx/parser/validation/built-in/uri/makefile +++ b/tests/cxx/parser/validation/built-in/uri/makefile @@ -32,22 +32,17 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) # Test. # -.PHONY: $(test) - $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) diff --git a/tests/cxx/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile index d808ee2..ba8c89a 100644 --- a/tests/cxx/parser/validation/choice/makefile +++ b/tests/cxx/parser/validation/choice/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,9 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -62,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/makefile b/tests/cxx/parser/validation/makefile index 9000e4c..e2e23e0 100644 --- a/tests/cxx/parser/validation/makefile +++ b/tests/cxx/parser/validation/makefile @@ -5,16 +5,12 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - tests := all any attribute built-in choice restriction sequence - default := $(out_base)/ test := $(out_base)/.test clean := $(out_base)/.clean -.PHONY: $(default) $(test) $(clean) - $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) diff --git a/tests/cxx/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile index c7914c2..2a52880 100644 --- a/tests/cxx/parser/validation/restriction/makefile +++ b/tests/cxx/parser/validation/restriction/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ diff --git a/tests/cxx/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile index 7040d98..32a2781 100644 --- a/tests/cxx/parser/validation/sequence/makefile +++ b/tests/cxx/parser/validation/sequence/makefile @@ -42,7 +42,6 @@ $(call include-dep,$(dep)) # Convenience alias for default target. # -.PHONY: $(out_base)/ $(out_base)/: $(driver) @@ -50,10 +49,7 @@ $(out_base)/: $(driver) # test_targets := $(addprefix $(out_base)/.test-,$(tests)) -.PHONY: $(test) $(test): $(test_targets) - - $(test_targets): driver := $(driver) .PHONY: $(out_base)/.test-% @@ -63,8 +59,6 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src # Clean. # -.PHONY: $(clean) - $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(obj)) \ $(addsuffix .cxx.clean,$(dep)) \ -- cgit v1.1