From 7899564da489006f40f23c789b850b2f843de6cf Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 4 Nov 2009 09:24:15 +0200 Subject: Implement install target for examples --- examples/cxx/tree/custom/calendar/makefile | 16 +++++++++++++--- examples/cxx/tree/custom/comments/makefile | 16 ++++++++++++++-- examples/cxx/tree/custom/contacts/makefile | 14 ++++++++++++-- examples/cxx/tree/custom/double/makefile | 13 +++++++++++-- examples/cxx/tree/custom/makefile | 12 +++++++++--- examples/cxx/tree/custom/mixed/makefile | 14 ++++++++++++-- examples/cxx/tree/custom/taxonomy/makefile | 15 +++++++++++++-- examples/cxx/tree/custom/wildcard/makefile | 14 ++++++++++++-- 8 files changed, 96 insertions(+), 18 deletions(-) (limited to 'examples/cxx/tree/custom') diff --git a/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile index 9b77e96..91c2ffb 100644 --- a/examples/cxx/tree/custom/calendar/makefile +++ b/examples/cxx/tree/custom/calendar/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -23,7 +24,7 @@ $(call import,\ $(scf_root)/import/libxerces-c/stub.make,\ l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) -ifeq ($(filter $(MAKECMDGOALS),dist dist-win),) +ifeq ($(filter $(MAKECMDGOALS),dist dist-win install),) $(call import,\ $(scf_root)/import/libboost/date-time/stub.make,\ l: boost_date_time.l,cpp-options: boost_date_time.l.cpp-options) @@ -66,11 +67,20 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/calendar.xsd,$(install_doc_dir)/xsd/$(path)/calendar.xsd) + $(call install-data,$(src_base)/calendar.xml,$(install_doc_dir)/xsd/$(path)/calendar.xml) + $(call install-data,$(src_base)/xml-schema-custom.hxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.hxx) + $(call install-data,$(src_base)/xml-schema-custom.cxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile index 28f3f69..22c3cec 100644 --- a/examples/cxx/tree/custom/comments/makefile +++ b/examples/cxx/tree/custom/comments/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -58,11 +59,22 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/people.xsd,$(install_doc_dir)/xsd/$(path)/people.xsd) + $(call install-data,$(src_base)/people.xml,$(install_doc_dir)/xsd/$(path)/people.xml) + $(call install-data,$(src_base)/xml-schema-custom.hxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.hxx) + $(call install-data,$(src_base)/xml-schema-custom.cxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.cxx) + $(call install-data,$(src_base)/dom-parse.hxx,$(install_doc_dir)/xsd/$(path)/dom-parse.hxx) + $(call install-data,$(src_base)/dom-parse.cxx,$(install_doc_dir)/xsd/$(path)/dom-parse.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/contacts/makefile b/examples/cxx/tree/custom/contacts/makefile index c7e0856..ceb34d0 100644 --- a/examples/cxx/tree/custom/contacts/makefile +++ b/examples/cxx/tree/custom/contacts/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -52,11 +53,20 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/contacts.xsd,$(install_doc_dir)/xsd/$(path)/contacts.xsd) + $(call install-data,$(src_base)/contacts.xml,$(install_doc_dir)/xsd/$(path)/contacts.xml) + $(call install-data,$(src_base)/contacts-custom.hxx,$(install_doc_dir)/xsd/$(path)/contacts-custom.hxx) + $(call install-data,$(src_base)/contacts-custom.cxx,$(install_doc_dir)/xsd/$(path)/contacts-custom.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile index 550b40f..c58d41b 100644 --- a/examples/cxx/tree/custom/double/makefile +++ b/examples/cxx/tree/custom/double/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -53,11 +54,19 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/order.xsd,$(install_doc_dir)/xsd/$(path)/order.xsd) + $(call install-data,$(src_base)/double-custom.hxx,$(install_doc_dir)/xsd/$(path)/double-custom.hxx) + $(call install-data,$(src_base)/double-custom.cxx,$(install_doc_dir)/xsd/$(path)/double-custom.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/makefile b/examples/cxx/tree/custom/makefile index fc851e3..8c6e4f4 100644 --- a/examples/cxx/tree/custom/makefile +++ b/examples/cxx/tree/custom/makefile @@ -13,6 +13,7 @@ build_examples += calendar endif default := $(out_base)/ +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -21,9 +22,12 @@ clean := $(out_base)/.clean # $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_examples))) -# Dist. +# Install & Dist. # -$(dist) $(dist-win): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win): path := $(subst $(src_root)/,,$(src_base)) + +$(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(all_examples))) + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_examples))) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README) @@ -36,7 +40,9 @@ $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_examples))) # $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_examples))) -ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(call include,$(bld_root)/install.make) + +ifneq ($(filter $(MAKECMDGOALS),dist dist-win install),) $(foreach e,$(all_examples),$(call import,$(src_base)/$e/makefile)) else $(foreach e,$(build_examples),$(call import,$(src_base)/$e/makefile)) diff --git a/examples/cxx/tree/custom/mixed/makefile b/examples/cxx/tree/custom/mixed/makefile index 67807a6..54891b2 100644 --- a/examples/cxx/tree/custom/mixed/makefile +++ b/examples/cxx/tree/custom/mixed/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -53,11 +54,20 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/people.xsd,$(install_doc_dir)/xsd/$(path)/people.xsd) + $(call install-data,$(src_base)/people.xml,$(install_doc_dir)/xsd/$(path)/people.xml) + $(call install-data,$(src_base)/people-custom.hxx,$(install_doc_dir)/xsd/$(path)/people-custom.hxx) + $(call install-data,$(src_base)/people-custom.cxx,$(install_doc_dir)/xsd/$(path)/people-custom.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/taxonomy/makefile b/examples/cxx/tree/custom/taxonomy/makefile index ef3b39a..3df95c0 100644 --- a/examples/cxx/tree/custom/taxonomy/makefile +++ b/examples/cxx/tree/custom/taxonomy/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -57,11 +58,21 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/people.xsd,$(install_doc_dir)/xsd/$(path)/people.xsd) + $(call install-data,$(src_base)/people.xml,$(install_doc_dir)/xsd/$(path)/people.xml) + $(call install-data,$(src_base)/people-custom.hxx,$(install_doc_dir)/xsd/$(path)/people-custom.hxx) + $(call install-data,$(src_base)/people-custom.cxx,$(install_doc_dir)/xsd/$(path)/people-custom.cxx) + $(call install-data,$(src_base)/people-custom-fwd.hxx,$(install_doc_dir)/xsd/$(path)/people-custom-fwd.hxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/custom/wildcard/makefile b/examples/cxx/tree/custom/wildcard/makefile index 4334132..74e6675 100644 --- a/examples/cxx/tree/custom/wildcard/makefile +++ b/examples/cxx/tree/custom/wildcard/makefile @@ -12,6 +12,7 @@ obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o)) dep := $(obj:.o=.o.d) driver := $(out_base)/driver +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -54,11 +55,20 @@ $(call include-dep,$(dep)) # $(out_base)/: $(driver) -# Dist. + +# Install & Dist. # dist-common := $(out_base)/.dist-common -$(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) +$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base)) + +$(install): + $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README) + $(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx) + $(call install-data,$(src_base)/wildcard.xsd,$(install_doc_dir)/xsd/$(path)/wildcard.xsd) + $(call install-data,$(src_base)/wildcard.xml,$(install_doc_dir)/xsd/$(path)/wildcard.xml) + $(call install-data,$(src_base)/wildcard-custom.hxx,$(install_doc_dir)/xsd/$(path)/wildcard-custom.hxx) + $(call install-data,$(src_base)/wildcard-custom.cxx,$(install_doc_dir)/xsd/$(path)/wildcard-custom.cxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) -- cgit v1.1