Split clean rules for sample implementation and test driver

Update makefiles that use these rules.

7 files changed, 24 insertions, 16 deletions

diff --git a/build/xsde/parser/xsd-cxx.make b/build/xsde/parser/xsd-cxx.make
index ee6c742..9470dfa 100644
--- a/build/xsde/parser/xsd-cxx.make
+++ b/build/xsde/parser/xsd-cxx.make
@@ -20,10 +20,11 @@ $(out_base)/%$(xsd_pskel_suffix).ixx
 ifneq ($(xsd_pimpl_suffix),)
 xsd_parser_pattern +=                \
 $(out_base)/%$(xsd_pimpl_suffix).cxx \
-$(out_base)/%$(xsd_pimpl_suffix).hxx \
-$(out_base)/%-pdriver.cxx
+$(out_base)/%$(xsd_pimpl_suffix).hxx
 endif
 
+xsd_parser_pattern += $(out_base)/%-pdriver.cxx
+
 $(xsd_parser_pattern): xsde := xsde
 $(xsd_parser_pattern): xsde_command := cxx-parser
 
@@ -82,7 +83,6 @@ endif
 
 
 .PHONY: $(out_base)/%$(xsd_pskel_suffix).cxx.xsd.clean
-
 $(out_base)/%$(xsd_pskel_suffix).cxx.xsd.clean:
 	$(call message,rm $(@:.cxx.xsd.clean=.cxx),rm -f $(@:.cxx.xsd.clean=.cxx))
 	$(call message,rm $(@:.cxx.xsd.clean=.hxx),rm -f $(@:.cxx.xsd.clean=.hxx))
@@ -90,13 +90,15 @@ $(out_base)/%$(xsd_pskel_suffix).cxx.xsd.clean:
 
 ifneq ($(xsd_pimpl_suffix),)
 .PHONY: $(out_base)/%$(xsd_pimpl_suffix).cxx.xsd.clean
-
 $(out_base)/%$(xsd_pimpl_suffix).cxx.xsd.clean:
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.xsd.clean=.cxx))
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.xsd.clean=.hxx))
-	$(call message,rm $$1,rm -f $$1,$(out_base)/$*-pdriver.cxx)
 endif
 
+.PHONY: $(out_base)/%-pdriver.cxx.xsd.clean
+$(out_base)/%-pdriver.cxx.xsd.clean:
+	$(call message,rm $$1,rm -f $$1,$(out_base)/$*-pdriver.cxx)
+
 # Reset the config variables so they won't take effect in other places.
 #
 xsd_pskel_suffix :=
diff --git a/build/xsde/serializer/xsd-cxx.make b/build/xsde/serializer/xsd-cxx.make
index d318346..990a146 100644
--- a/build/xsde/serializer/xsd-cxx.make
+++ b/build/xsde/serializer/xsd-cxx.make
@@ -20,10 +20,11 @@ $(out_base)/%$(xsd_sskel_suffix).ixx
 ifneq ($(xsd_simpl_suffix),)
 xsd_serializer_pattern +=            \
 $(out_base)/%$(xsd_simpl_suffix).cxx \
-$(out_base)/%$(xsd_simpl_suffix).hxx \
-$(out_base)/%-sdriver.cxx
+$(out_base)/%$(xsd_simpl_suffix).hxx
 endif
 
+xsd_serializer_pattern += $(out_base)/%-sdriver.cxx
+
 $(xsd_serializer_pattern): xsde := xsde
 $(xsd_serializer_pattern): xsde_command := cxx-serializer
 
@@ -82,7 +83,6 @@ endif
 
 
 .PHONY: $(out_base)/%$(xsd_sskel_suffix).cxx.xsd.clean
-
 $(out_base)/%$(xsd_sskel_suffix).cxx.xsd.clean:
 	$(call message,rm $(@:.cxx.xsd.clean=.cxx),rm -f $(@:.cxx.xsd.clean=.cxx))
 	$(call message,rm $(@:.cxx.xsd.clean=.hxx),rm -f $(@:.cxx.xsd.clean=.hxx))
@@ -90,13 +90,15 @@ $(out_base)/%$(xsd_sskel_suffix).cxx.xsd.clean:
 
 ifneq ($(xsd_simpl_suffix),)
 .PHONY: $(out_base)/%$(xsd_simpl_suffix).cxx.xsd.clean
-
 $(out_base)/%$(xsd_simpl_suffix).cxx.xsd.clean:
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.xsd.clean=.cxx))
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.xsd.clean=.hxx))
-	$(call message,rm $$1,rm -f $$1,$(out_base)/$*-sdriver.cxx)
 endif
 
+.PHONY: $(out_base)/%-sdriver.cxx.xsd.clean
+$(out_base)/%-sdriver.cxx.xsd.clean:
+	$(call message,rm $$1,rm -f $$1,$(out_base)/$*-sdriver.cxx)
+
 # Reset the config variables so they won't take effect in other places.
 #
 xsd_sskel_suffix :=
diff --git a/examples/cxx/parser/generated/makefile b/examples/cxx/parser/generated/makefile
index a7fd40a..14c039c 100644
--- a/examples/cxx/parser/generated/makefile
+++ b/examples/cxx/parser/generated/makefile
@@ -50,7 +50,8 @@ $(clean): $(driver).o.clean                                  \
   $(addsuffix .cxx.clean,$(obj))                             \
   $(addsuffix .cxx.clean,$(dep))                             \
   $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) \
-  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean))
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean)) \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pdriver.cxx.xsd.clean))
 
 
 # Generated .gitignore.
diff --git a/tests/cxx/parser/duplicate/makefile b/tests/cxx/parser/duplicate/makefile
index 345f29a..75cbdf3 100644
--- a/tests/cxx/parser/duplicate/makefile
+++ b/tests/cxx/parser/duplicate/makefile
@@ -58,7 +58,8 @@ $(clean): $(driver).o.clean                                  \
   $(addsuffix .cxx.clean,$(obj))                             \
   $(addsuffix .cxx.clean,$(dep))                             \
   $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) \
-  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean))
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean)) \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pdriver.cxx.xsd.clean))
 
 
 # Generated .gitignore.
diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile
index 82cb585..ff12aa7 100644
--- a/tests/cxx/parser/generated-impl/makefile
+++ b/tests/cxx/parser/generated-impl/makefile
@@ -58,7 +58,8 @@ $(clean): $(driver).o.clean                                  \
   $(addsuffix .cxx.clean,$(obj))                             \
   $(addsuffix .cxx.clean,$(dep))                             \
   $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) \
-  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean))
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean)) \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pdriver.cxx.xsd.clean))
 
 
 # Generated .gitignore.
diff --git a/tests/cxx/serializer/generated-driver/makefile b/tests/cxx/serializer/generated-driver/makefile
index eb55f1a..8271749 100644
--- a/tests/cxx/serializer/generated-driver/makefile
+++ b/tests/cxx/serializer/generated-driver/makefile
@@ -56,7 +56,8 @@ $(test): $(driver) $(src_base)/output
 $(clean): $(driver).o.clean                                  \
   $(addsuffix .cxx.clean,$(obj))                             \
   $(addsuffix .cxx.clean,$(dep))                             \
-  $(addprefix $(out_base)/,$(xsd:.xsd=-sskel.cxx.xsd.clean))
+  $(addprefix $(out_base)/,$(xsd:.xsd=-sskel.cxx.xsd.clean)) \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-sdriver.cxx.xsd.clean))
 
 
 # Generated .gitignore.
@@ -78,7 +79,6 @@ $(call include,$(bld_root)/cxx/o-e.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/cxx-d.make)
 
-xsd_simpl_suffix := -simpl
 $(call include,$(scf_root)/xsde/serializer/xsd-cxx.make)
 
 
diff --git a/tests/cxx/serializer/generated-impl/makefile b/tests/cxx/serializer/generated-impl/makefile
index 3d2abf3..86a7c0f 100644
--- a/tests/cxx/serializer/generated-impl/makefile
+++ b/tests/cxx/serializer/generated-impl/makefile
@@ -63,7 +63,8 @@ $(clean): $(driver).o.clean                                  \
   $(addsuffix .cxx.clean,$(obj))                             \
   $(addsuffix .cxx.clean,$(dep))                             \
   $(addprefix $(out_base)/,$(xsd:.xsd=-sskel.cxx.xsd.clean)) \
-  $(addprefix $(out_base)/,$(xsd:.xsd=-simpl.cxx.xsd.clean))
+  $(addprefix $(out_base)/,$(xsd:.xsd=-simpl.cxx.xsd.clean)) \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-sdriver.cxx.xsd.clean))
 
 
 # Generated .gitignore.