diff options
-rw-r--r-- | documentation/cxx/hybrid/guide/makefile | 5 | ||||
-rw-r--r-- | documentation/cxx/parser/guide/makefile | 5 | ||||
-rw-r--r-- | documentation/cxx/serializer/guide/makefile | 7 | ||||
-rw-r--r-- | documentation/makefile | 4 | ||||
-rw-r--r-- | examples/cxx/hybrid/binary/custom/makefile | 2 | ||||
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | tests/cxx/hybrid/binary/custom/makefile | 2 |
7 files changed, 15 insertions, 12 deletions
diff --git a/documentation/cxx/hybrid/guide/makefile b/documentation/cxx/hybrid/guide/makefile index 74cc909..3e6b04c 100644 --- a/documentation/cxx/hybrid/guide/makefile +++ b/documentation/cxx/hybrid/guide/makefile @@ -20,10 +20,11 @@ $(default): $(out_base)/cxx-hybrid-e-guide.ps \ $(out_base)/cxx-hybrid-e-guide.ps: $(src_base)/index.xhtml \ $(src_base)/figure-1.png \ - $(src_base)/guide.html2ps + $(src_base)/guide.html2ps \ + | $(out_base)/. $(call message,html2ps $<,html2ps -f $(src_base)/guide.html2ps -o $@ $<) -$(out_base)/cxx-hybrid-e-guide.pdf: $(out_base)/cxx-hybrid-e-guide.ps +$(out_base)/cxx-hybrid-e-guide.pdf: $(out_base)/cxx-hybrid-e-guide.ps | $(out_base)/. $(call message,ps2pdf $<,ps2pdf14 $< $@) # Dist. diff --git a/documentation/cxx/parser/guide/makefile b/documentation/cxx/parser/guide/makefile index 4b01826..ca29a63 100644 --- a/documentation/cxx/parser/guide/makefile +++ b/documentation/cxx/parser/guide/makefile @@ -20,10 +20,11 @@ $(default): $(out_base)/cxx-parser-e-guide.ps \ $(out_base)/cxx-parser-e-guide.ps: $(src_base)/index.xhtml \ $(src_base)/figure-1.png \ - $(src_base)/guide.html2ps + $(src_base)/guide.html2ps \ + | $(out_base)/. $(call message,html2ps $<,html2ps -f $(src_base)/guide.html2ps -o $@ $<) -$(out_base)/cxx-parser-e-guide.pdf: $(out_base)/cxx-parser-e-guide.ps +$(out_base)/cxx-parser-e-guide.pdf: $(out_base)/cxx-parser-e-guide.ps | $(out_base)/. $(call message,ps2pdf $<,ps2pdf14 $< $@) # Dist. diff --git a/documentation/cxx/serializer/guide/makefile b/documentation/cxx/serializer/guide/makefile index 9230398..5b16d4e 100644 --- a/documentation/cxx/serializer/guide/makefile +++ b/documentation/cxx/serializer/guide/makefile @@ -19,11 +19,12 @@ $(default): $(out_base)/cxx-serializer-e-guide.ps \ $(out_base)/cxx-serializer-e-guide.ps: $(src_base)/index.xhtml \ - $(src_base)/figure-1.png \ - $(src_base)/guide.html2ps + $(src_base)/figure-1.png \ + $(src_base)/guide.html2ps \ + | $(out_base)/. $(call message,html2ps $<,html2ps -f $(src_base)/guide.html2ps -o $@ $<) -$(out_base)/cxx-serializer-e-guide.pdf: $(out_base)/cxx-serializer-e-guide.ps +$(out_base)/cxx-serializer-e-guide.pdf: $(out_base)/cxx-serializer-e-guide.ps | $(out_base)/. $(call message,ps2pdf $<,ps2pdf14 $< $@) # Dist. diff --git a/documentation/makefile b/documentation/makefile index 056e540..6da7f23 100644 --- a/documentation/makefile +++ b/documentation/makefile @@ -26,8 +26,8 @@ $(dist-common): $(call install-data,$(src_base)/xsde.xhtml,$(dist_prefix)/documentation/xsde.xhtml) $(call install-data,$(src_base)/xsde.1,$(dist_prefix)/documentation/xsde.1) -$(dist): $(dist-common) $(src_base)/cxx/.dist -$(dist-win): $(dist-common) $(src_base)/cxx/.dist +$(dist): $(dist-common) $(out_base)/cxx/.dist +$(dist-win): $(dist-common) $(out_base)/cxx/.dist # Install. diff --git a/examples/cxx/hybrid/binary/custom/makefile b/examples/cxx/hybrid/binary/custom/makefile index 51fafa5..4797434 100644 --- a/examples/cxx/hybrid/binary/custom/makefile +++ b/examples/cxx/hybrid/binary/custom/makefile @@ -51,7 +51,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \ # $(out_base)/xml-schema%hxx \ $(out_base)/xml-schema-pskel%hxx \ -$(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde +$(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde | $(out_base)/. $(call message,xsde $(src_base)/xml-schema.xsd,\ $(out_root)/xsde/xsde cxx-hybrid --output-dir $(out_base) \ --generate-xml-schema --generate-parser --generate-serializer \ @@ -70,7 +70,7 @@ $(dist-win): $(dist-common) \ $(out_base)/xsde/.dist-win \ $(out_base)/libxsde/.dist-win \ $(out_base)/examples/.dist-win \ - $(src_base)/documentation/.dist-win + $(out_base)/documentation/.dist-win $(call install-data,$(src_base)/GPLv2,$(dist_prefix)/GPLv2.txt) $(call message,,unix2dos $(dist_prefix)/GPLv2.txt) $(call install-data,$(src_base)/LICENSE,$(dist_prefix)/LICENSE.txt) diff --git a/tests/cxx/hybrid/binary/custom/makefile b/tests/cxx/hybrid/binary/custom/makefile index 8675470..f23036e 100644 --- a/tests/cxx/hybrid/binary/custom/makefile +++ b/tests/cxx/hybrid/binary/custom/makefile @@ -51,7 +51,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \ # $(out_base)/xml-schema%hxx \ $(out_base)/xml-schema-pskel%hxx \ -$(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde +$(out_base)/xml-schema-sskel%hxx: $(out_root)/xsde/xsde | $(out_base)/. $(call message,xsde $(src_base)/xml-schema.xsd,\ $(out_root)/xsde/xsde cxx-hybrid --output-dir $(out_base) \ --generate-xml-schema --generate-parser --generate-serializer \ |