From 0ee7ed9b81b9c18a2af3133cba364b9dbec9bec5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 12 Oct 2009 10:00:32 +0200
Subject: Build system cleanups

---
 tests/dump/makefile                   |  6 ------
 tests/makefile                        |  2 --
 tests/schema/annotation/makefile      | 10 ----------
 tests/schema/anonymous/makefile       | 10 ----------
 tests/schema/attribute-group/makefile | 11 -----------
 tests/schema/element-group/makefile   | 10 ----------
 tests/schema/makefile                 |  4 ----
 7 files changed, 53 deletions(-)

(limited to 'tests')

diff --git a/tests/dump/makefile b/tests/dump/makefile
index ddd8986..95ec764 100644
--- a/tests/dump/makefile
+++ b/tests/dump/makefile
@@ -15,7 +15,6 @@ xsd-fe.l.cpp-options := $(out_root)/xsd-frontend/xsd-frontend.l.cpp-options
 driver  := $(out_base)/driver
 clean   := $(out_base)/.clean
 
-
 # Build.
 #
 $(driver): $(cxx_obj) $(xsd-fe.l)
@@ -24,17 +23,12 @@ $(cxx_obj) $(cxx_od): $(xsd-fe.l.cpp-options)
 
 $(call include-dep,$(cxx_od))
 
-
 # Convenience alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(driver)
 
-
 # Clean.
 #
-.PHONY: $(clean)
-
 $(clean): $(driver).o.clean          \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))
diff --git a/tests/makefile b/tests/makefile
index 6ce3f6b..272d702 100644
--- a/tests/makefile
+++ b/tests/makefile
@@ -9,8 +9,6 @@ default   := $(out_base)/
 test      := $(out_base)/.test
 clean     := $(out_base)/.clean
 
-.PHONY: $(default) $(test) $(clean)
-
 $(default): $(out_base)/dump/ $(out_base)/schema/
 $(test): $(out_base)/schema/.test
 $(clean): $(out_base)/dump/.clean $(out_base)/schema/.clean
diff --git a/tests/schema/annotation/makefile b/tests/schema/annotation/makefile
index 2af53d6..d637b22 100644
--- a/tests/schema/annotation/makefile
+++ b/tests/schema/annotation/makefile
@@ -11,35 +11,25 @@ driver := $(out_root)/tests/dump/driver
 test   := $(out_base)/.test
 clean  := $(out_base)/.clean
 
-
 # Convenience alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(driver)
 
-
 # Test.
 #
 test_targets := $(addprefix $(out_base)/.test-,$(tests))
 
-.PHONY: $(test)
-
 $(test): $(test_targets)
-
 $(test_targets): driver := $(driver)
 
 .PHONY: $(out_base)/.test-%
 $(out_base)/.test-%: $(driver) $(src_base)/test-%.xsd $(src_base)/test-%.std
 	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xsd | diff -u $(src_base)/test-$*.std -)
 
-
 # Clean.
 #
-.PHONY: $(clean)
-
 $(clean):
 
-
 # Dependencies.
 #
 $(call import,$(src_root)/tests/dump/makefile)
diff --git a/tests/schema/anonymous/makefile b/tests/schema/anonymous/makefile
index 2140789..17ddb16 100644
--- a/tests/schema/anonymous/makefile
+++ b/tests/schema/anonymous/makefile
@@ -11,35 +11,25 @@ driver := $(out_root)/tests/dump/driver
 test   := $(out_base)/.test
 clean  := $(out_base)/.clean
 
-
 # Convenience alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(driver)
 
-
 # Test.
 #
 test_targets := $(addprefix $(out_base)/.test-,$(tests))
 
-.PHONY: $(test)
-
 $(test): $(test_targets)
-
 $(test_targets): driver := $(driver)
 
 .PHONY: $(out_base)/.test-%
 $(out_base)/.test-%: $(driver) $(src_base)/test-%.xsd $(src_base)/test-%.std
 	$(call message,test $(out_base)/$*,$(driver) --anonymous $(src_base)/test-$*.xsd | diff -u $(src_base)/test-$*.std -)
 
-
 # Clean.
 #
-.PHONY: $(clean)
-
 $(clean):
 
-
 # Dependencies.
 #
 $(call import,$(src_root)/tests/dump/makefile)
diff --git a/tests/schema/attribute-group/makefile b/tests/schema/attribute-group/makefile
index 0e4d5ed..20c805b 100644
--- a/tests/schema/attribute-group/makefile
+++ b/tests/schema/attribute-group/makefile
@@ -11,36 +11,25 @@ driver := $(out_root)/tests/dump/driver
 test   := $(out_base)/.test
 clean  := $(out_base)/.clean
 
-
 # Convenience alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(driver)
 
-
 # Test.
 #
 test_targets := $(addprefix $(out_base)/.test-,$(tests))
 
-.PHONY: $(test)
-
 $(test): $(test_targets)
-
 $(test_targets): driver := $(driver)
 
 .PHONY: $(out_base)/.test-%
 $(out_base)/.test-%: $(driver) $(src_base)/test-%.xsd $(src_base)/test-%.std
 	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xsd | diff -u $(src_base)/test-$*.std -)
 
-
-
 # Clean.
 #
-.PHONY: $(clean)
-
 $(clean):
 
-
 # Dependencies.
 #
 $(call import,$(src_root)/tests/dump/makefile)
diff --git a/tests/schema/element-group/makefile b/tests/schema/element-group/makefile
index f3d3b41..8e75dba 100644
--- a/tests/schema/element-group/makefile
+++ b/tests/schema/element-group/makefile
@@ -11,35 +11,25 @@ driver := $(out_root)/tests/dump/driver
 test   := $(out_base)/.test
 clean  := $(out_base)/.clean
 
-
 # Convenience alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(driver)
 
-
 # Test.
 #
 test_targets := $(addprefix $(out_base)/.test-,$(tests))
 
-.PHONY: $(test)
-
 $(test): $(test_targets)
-
 $(test_targets): driver := $(driver)
 
 .PHONY: $(out_base)/.test-%
 $(out_base)/.test-%: $(driver) $(src_base)/test-%.xsd $(src_base)/test-%.std
 	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xsd | diff -u $(src_base)/test-$*.std -)
 
-
 # Clean.
 #
-.PHONY: $(clean)
-
 $(clean):
 
-
 # Dependencies.
 #
 $(call import,$(src_root)/tests/dump/makefile)
diff --git a/tests/schema/makefile b/tests/schema/makefile
index 3023cab..c101aa1 100644
--- a/tests/schema/makefile
+++ b/tests/schema/makefile
@@ -5,16 +5,12 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
-
 tests := annotation anonymous attribute-group element-group
 
-
 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)))
-- 
cgit v1.1