From 5aa48fc52202fd95210d8860b66769550732a5d9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 17 Jul 2012 15:16:34 +0200 Subject: Add support for tests with multiple ODB headers --- common/circular/multiple/makefile | 7 ++++--- common/circular/single/makefile | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'common/circular') diff --git a/common/circular/multiple/makefile b/common/circular/multiple/makefile index 82a0bae..abd72e7 100644 --- a/common/circular/multiple/makefile +++ b/common/circular/multiple/makefile @@ -58,13 +58,14 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) +$(dist): export odb_header_stem := $(basename $(odb_hdr)) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ $(call vc10projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) - $(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/common/circular/single/makefile b/common/circular/single/makefile index e1677d4..1fcfdb0 100644 --- a/common/circular/single/makefile +++ b/common/circular/single/makefile @@ -58,9 +58,9 @@ $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ $(call vc10projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) - $(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