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/binary/boost/makefile | 17 ++++++++++++++--- examples/cxx/tree/binary/cdr/makefile | 14 +++++++++++--- examples/cxx/tree/binary/makefile | 12 +++++++++--- examples/cxx/tree/binary/xdr/makefile | 12 ++++++++++-- 4 files changed, 44 insertions(+), 11 deletions(-) (limited to 'examples/cxx/tree/binary') diff --git a/examples/cxx/tree/binary/boost/makefile b/examples/cxx/tree/binary/boost/makefile index 0cfd3ad..c3f1938 100644 --- a/examples/cxx/tree/binary/boost/makefile +++ b/examples/cxx/tree/binary/boost/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/serialization/stub.make,\ l: boost_serialization.l,cpp-options: boost_serialization.l.cpp-options) @@ -55,11 +56,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)/library.xsd,$(install_doc_dir)/xsd/$(path)/library.xsd) + $(call install-data,$(src_base)/library.xml,$(install_doc_dir)/xsd/$(path)/library.xml) + $(call install-data,$(src_base)/library-prologue.hxx,$(install_doc_dir)/xsd/$(path)/library-prologue.hxx) + $(call install-data,$(src_base)/boost-archive-extraction.hxx,$(install_doc_dir)/xsd/$(path)/boost-archive-extraction.hxx) + $(call install-data,$(src_base)/boost-archive-insertion.hxx,$(install_doc_dir)/xsd/$(path)/boost-archive-insertion.hxx) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/binary/cdr/makefile b/examples/cxx/tree/binary/cdr/makefile index 8b7ffc2..1b49cd1 100644 --- a/examples/cxx/tree/binary/cdr/makefile +++ b/examples/cxx/tree/binary/cdr/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/libace/stub.make,\ l: ace.l,cpp-options: ace.l.cpp-options) @@ -51,11 +52,18 @@ $(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)/library.xsd,$(install_doc_dir)/xsd/$(path)/library.xsd) + $(call install-data,$(src_base)/library.xml,$(install_doc_dir)/xsd/$(path)/library.xml) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) diff --git a/examples/cxx/tree/binary/makefile b/examples/cxx/tree/binary/makefile index b2c111f..53c5891 100644 --- a/examples/cxx/tree/binary/makefile +++ b/examples/cxx/tree/binary/makefile @@ -21,6 +21,7 @@ build_examples += xdr endif default := $(out_base)/ +install := $(out_base)/.install dist := $(out_base)/.dist dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean @@ -29,9 +30,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) @@ -44,7 +48,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/binary/xdr/makefile b/examples/cxx/tree/binary/xdr/makefile index 8a78304..bbc8ab3 100644 --- a/examples/cxx/tree/binary/xdr/makefile +++ b/examples/cxx/tree/binary/xdr/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 @@ -43,11 +44,18 @@ $(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)/library.xsd,$(install_doc_dir)/xsd/$(path)/library.xsd) + $(call install-data,$(src_base)/library.xml,$(install_doc_dir)/xsd/$(path)/library.xml) $(dist-common): $(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx) -- cgit v1.1