aboutsummaryrefslogtreecommitdiff
path: root/inheritance
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-04-28 17:31:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-04-28 17:31:31 +0200
commite8dcec196363c7043018ad9dade5a7ad408268e6 (patch)
treee35a56b2ceeab046cebbfeefd763b79688ee7c31 /inheritance
parent3506ef645e4cd26aebb73f493001d584e4cce22a (diff)
Fix dist rules for inheritance examples
Diffstat (limited to 'inheritance')
-rw-r--r--inheritance/polymorphism/makefile7
-rw-r--r--inheritance/reuse/makefile6
2 files changed, 7 insertions, 6 deletions
diff --git a/inheritance/polymorphism/makefile b/inheritance/polymorphism/makefile
index f3538ae..bc30e8a 100644
--- a/inheritance/polymorphism/makefile
+++ b/inheritance/polymorphism/makefile
@@ -64,14 +64,15 @@ $(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
$(dist): headers := $(odb_hdr)
$(dist): export name := $(name)
+$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun))
$(dist): export odb_header_stem := $(basename $(odb_hdr))
$(dist): export extra_dist := README $(call vc9projs,$(name)) \
$(call vc10projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) README database.hxx)
- $(call meta-automake,../template/Makefile.am)
- $(call meta-vc9projs,../template/template,$(name))
- $(call meta-vc10projs,../template/template,$(name))
+ $(call meta-automake,../../template/Makefile.am)
+ $(call meta-vc9projs,../../template/template,$(name))
+ $(call meta-vc10projs,../../template/template,$(name))
# Test.
#
diff --git a/inheritance/reuse/makefile b/inheritance/reuse/makefile
index 32af647..57a0607 100644
--- a/inheritance/reuse/makefile
+++ b/inheritance/reuse/makefile
@@ -69,9 +69,9 @@ $(dist): export extra_dist := README $(call vc9projs,$(name)) \
$(call vc10projs,$(name))
$(dist):
$(call dist-data,$(sources) $(headers) README database.hxx)
- $(call meta-automake,../template/Makefile.am)
- $(call meta-vc9projs,../template/template,$(name))
- $(call meta-vc10projs,../template/template,$(name))
+ $(call meta-automake,../../template/Makefile.am)
+ $(call meta-vc9projs,../../template/template,$(name))
+ $(call meta-vc10projs,../../template/template,$(name))
# Test.
#