From 3fd3cfc36784be43f545f2f0973e3dc58f475996 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 25 Feb 2009 10:31:55 +0200
Subject: Split clean rules for sample implementation and test driver

Update makefiles that use these rules.
---
 build/xsde/parser/xsd-cxx.make     | 12 +++++++-----
 build/xsde/serializer/xsd-cxx.make | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'build/xsde')

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 :=
-- 
cgit v1.1