From e8dcec196363c7043018ad9dade5a7ad408268e6 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 28 Apr 2012 17:31:31 +0200 Subject: Fix dist rules for inheritance examples --- inheritance/polymorphism/makefile | 7 ++++--- inheritance/reuse/makefile | 6 +++--- 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. # -- cgit v1.1