Build system cleanups

10 files changed, 10 insertions, 74 deletions

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 25dc2d8..549fe5b 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -18,33 +18,29 @@ endif
 
 # Aliases
 #
+.PHONY: $(out_base)/       \
+        $(out_base)/.test  \
+        $(out_base)/.clean
+
 ifdef %interactive%
 
-.PHONY: test $(out_base)/.test \
-        clean $(out_base)/.clean
+.PHONY: test clean
 
 test: $(out_base)/.test
 clean: $(out_base)/.clean
 
-ifeq ($(.DEFAULT_GOAL),test)
+ifneq ($(filter $(.DEFAULT_GOAL),test clean),)
 .DEFAULT_GOAL :=
 endif
 
-ifeq ($(.DEFAULT_GOAL),clean)
-.DEFAULT_GOAL :=
 endif
 
-endif
-
-# Don't include dependency info if we are cleaning.
+# Don't include dependency info for certain targets.
 #
 define include-dep
-endef
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),disfigure)
-define include-dep
 $(call -include,$1)
 endef
-endif
+
+ifneq ($(filter $(MAKECMDGOALS),clean cleandoc disfigure),)
+include-dep =
 endif
diff --git a/makefile b/makefile
index 2078eae..e2751fb 100644
--- a/makefile
+++ b/makefile
@@ -9,12 +9,9 @@ default := $(out_base)/
 test    := $(out_base)/.test
 clean   := $(out_base)/.clean
 
-.PHONY: $(default) $(test) $(clean)
-
 $(default): $(out_base)/xsd-frontend/ $(out_base)/tests/
 $(test): $(out_base)/tests/.test
 $(clean): $(out_base)/xsd-frontend/.clean $(out_base)/tests/.clean
 
-
 $(call import,$(src_base)/xsd-frontend/makefile)
 $(call import,$(src_base)/tests/makefile)
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)))
diff --git a/xsd-frontend/makefile b/xsd-frontend/makefile
index 5e1c45f..6e88369 100644
--- a/xsd-frontend/makefile
+++ b/xsd-frontend/makefile
@@ -74,7 +74,6 @@ $(call import,\
   $(scf_root)/import/libfrontend-elements/stub.make,\
   l: fe.l,cpp-options: fe.l.cpp-options)
 
-
 # what to build
 #
 $(xsd_frontend.l): $(cxx_obj) $(fe.l) $(cult.l) $(xerces_c.l) $(fs.l)
@@ -97,13 +96,10 @@ $(call include-dep,$(cxx_od))
 
 # Alias for default target.
 #
-.PHONY: $(out_base)/
 $(out_base)/: $(xsd_frontend.l)
 
 # Clean
 #
-.PHONY: $(clean)
-
 $(clean): $(xsd_frontend.l).o.clean     \
   $(xsd_frontend.l.cpp-options).clean   \
   $(addsuffix .cxx.clean,$(cxx_obj))    \