diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/xsde/parser/xsd-cxx.make | 12 | ||||
-rw-r--r-- | build/xsde/serializer/xsd-cxx.make | 12 |
2 files changed, 14 insertions, 10 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 := |