From 61c48f6d4fc422d9f2a68c99ee5eb2da3cf8a645 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Nov 2013 08:42:24 +0200 Subject: Add support for manual dependency tracking in tests and examples --- tests/cxx/tree/binary/cdr/makefile | 2 +- tests/cxx/tree/binary/polymorphic/makefile | 2 +- tests/cxx/tree/binary/xdr/makefile | 2 +- tests/cxx/tree/built-in/makefile | 3 +-- tests/cxx/tree/chameleon/makefile | 2 +- tests/cxx/tree/comparison/makefile | 2 +- tests/cxx/tree/compilation/makefile | 2 +- tests/cxx/tree/complex/ctor/makefile | 2 +- tests/cxx/tree/containment/makefile | 2 +- tests/cxx/tree/default/general/makefile | 2 +- tests/cxx/tree/default/omit/makefile | 2 +- tests/cxx/tree/detach/makefile | 2 +- tests/cxx/tree/encoding/char/iso-8859-1/makefile | 2 +- tests/cxx/tree/encoding/char/lcp/makefile | 2 +- tests/cxx/tree/encoding/char/utf-8/makefile | 2 +- tests/cxx/tree/encoding/wchar/makefile | 2 +- tests/cxx/tree/enumeration/ctor/makefile | 2 +- tests/cxx/tree/enumeration/inheritance/makefile | 2 +- tests/cxx/tree/float/makefile | 2 +- tests/cxx/tree/list/ctor/makefile | 2 +- tests/cxx/tree/name-clash/inheritance/makefile | 2 +- tests/cxx/tree/naming/camel/makefile | 2 +- tests/cxx/tree/naming/java/makefile | 2 +- tests/cxx/tree/naming/knr/makefile | 2 +- tests/cxx/tree/polymorphism/comparison/makefile | 2 +- tests/cxx/tree/polymorphism/ostream/makefile | 2 +- tests/cxx/tree/polymorphism/same-type/makefile | 2 +- tests/cxx/tree/prefix/makefile | 2 +- tests/cxx/tree/test-template/makefile | 2 +- tests/cxx/tree/types-only/makefile | 2 +- tests/cxx/tree/union/ctor/makefile | 2 +- tests/cxx/tree/wildcard/makefile | 2 +- 32 files changed, 32 insertions(+), 33 deletions(-) (limited to 'tests/cxx/tree') diff --git a/tests/cxx/tree/binary/cdr/makefile b/tests/cxx/tree/binary/cdr/makefile index da7ebe0..9298961 100644 --- a/tests/cxx/tree/binary/cdr/makefile +++ b/tests/cxx/tree/binary/cdr/makefile @@ -41,7 +41,7 @@ $(gen): xsd_options := --generate-insertion ACE_OutputCDR \ --generate-extraction ACE_InputCDR $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/binary/polymorphic/makefile b/tests/cxx/tree/binary/polymorphic/makefile index 2138eeb..cca1e2c 100644 --- a/tests/cxx/tree/binary/polymorphic/makefile +++ b/tests/cxx/tree/binary/polymorphic/makefile @@ -41,7 +41,7 @@ $(gen): xsd_options := --generate-polymorphic --root-element-last \ --generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/binary/xdr/makefile b/tests/cxx/tree/binary/xdr/makefile index f72e161..bf37c4b 100644 --- a/tests/cxx/tree/binary/xdr/makefile +++ b/tests/cxx/tree/binary/xdr/makefile @@ -36,7 +36,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-insertion XDR --generate-extraction XDR $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/built-in/makefile b/tests/cxx/tree/built-in/makefile index d15a15a..e30789f 100644 --- a/tests/cxx/tree/built-in/makefile +++ b/tests/cxx/tree/built-in/makefile @@ -46,8 +46,7 @@ $(gen): xsd_options := \ $(gen): $(src_root)/xsd/xsd -$(call include-dep,$(dep)) - +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/chameleon/makefile b/tests/cxx/tree/chameleon/makefile index 37fb74d..59f2a7e 100644 --- a/tests/cxx/tree/chameleon/makefile +++ b/tests/cxx/tree/chameleon/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --root-element root --generate-ostream $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/comparison/makefile b/tests/cxx/tree/comparison/makefile index 3cbe6f5..be76d46 100644 --- a/tests/cxx/tree/comparison/makefile +++ b/tests/cxx/tree/comparison/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-comparison $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/compilation/makefile b/tests/cxx/tree/compilation/makefile index d4201c7..72769f2 100644 --- a/tests/cxx/tree/compilation/makefile +++ b/tests/cxx/tree/compilation/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-serialization $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/complex/ctor/makefile b/tests/cxx/tree/complex/ctor/makefile index 6070b44..64ae848 100644 --- a/tests/cxx/tree/complex/ctor/makefile +++ b/tests/cxx/tree/complex/ctor/makefile @@ -39,7 +39,7 @@ $(gen): xsd_options := --generate-default-ctor --generate-from-base-ctor \ --generate-comparison $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/containment/makefile b/tests/cxx/tree/containment/makefile index 58509ae..ea1a160 100644 --- a/tests/cxx/tree/containment/makefile +++ b/tests/cxx/tree/containment/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-default-ctor $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/default/general/makefile b/tests/cxx/tree/default/general/makefile index 9ae4bd2..3c555ac 100644 --- a/tests/cxx/tree/default/general/makefile +++ b/tests/cxx/tree/default/general/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-ostream --generate-serialization \ --generate-default-ctor --generate-from-base-ctor $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/default/omit/makefile b/tests/cxx/tree/default/omit/makefile index 4a6aaf0..53dd1d1 100644 --- a/tests/cxx/tree/default/omit/makefile +++ b/tests/cxx/tree/default/omit/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-ostream --generate-serialization \ --generate-default-ctor --generate-from-base-ctor --omit-default-attributes $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/detach/makefile b/tests/cxx/tree/detach/makefile index b460dfb..44668a2 100644 --- a/tests/cxx/tree/detach/makefile +++ b/tests/cxx/tree/detach/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-detach --generate-default-ctor $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/makefile b/tests/cxx/tree/encoding/char/iso-8859-1/makefile index 79d4de3..701c20e 100644 --- a/tests/cxx/tree/encoding/char/iso-8859-1/makefile +++ b/tests/cxx/tree/encoding/char/iso-8859-1/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --char-encoding iso8859-1 --generate-serialization \ --generate-doxygen $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/encoding/char/lcp/makefile b/tests/cxx/tree/encoding/char/lcp/makefile index 47bf85d..a7a4b82 100644 --- a/tests/cxx/tree/encoding/char/lcp/makefile +++ b/tests/cxx/tree/encoding/char/lcp/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-serialization --char-encoding lcp $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/encoding/char/utf-8/makefile b/tests/cxx/tree/encoding/char/utf-8/makefile index aa748df..2224d85 100644 --- a/tests/cxx/tree/encoding/char/utf-8/makefile +++ b/tests/cxx/tree/encoding/char/utf-8/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-serialization --generate-doxygen $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/encoding/wchar/makefile b/tests/cxx/tree/encoding/wchar/makefile index c2d81a3..dd601ca 100644 --- a/tests/cxx/tree/encoding/wchar/makefile +++ b/tests/cxx/tree/encoding/wchar/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-serialization --generate-doxygen \ --char-type wchar_t $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/enumeration/ctor/makefile b/tests/cxx/tree/enumeration/ctor/makefile index 2086242..4837e7c 100644 --- a/tests/cxx/tree/enumeration/ctor/makefile +++ b/tests/cxx/tree/enumeration/ctor/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-default-ctor --generate-from-base-ctor \ --generate-doxygen $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/enumeration/inheritance/makefile b/tests/cxx/tree/enumeration/inheritance/makefile index 6f40509..5677adc 100644 --- a/tests/cxx/tree/enumeration/inheritance/makefile +++ b/tests/cxx/tree/enumeration/inheritance/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-ostream $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/float/makefile b/tests/cxx/tree/float/makefile index da12da3..230d682 100644 --- a/tests/cxx/tree/float/makefile +++ b/tests/cxx/tree/float/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-serialization --root-element-all $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/list/ctor/makefile b/tests/cxx/tree/list/ctor/makefile index 35581bb..8cfde68 100644 --- a/tests/cxx/tree/list/ctor/makefile +++ b/tests/cxx/tree/list/ctor/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-default-ctor --generate-from-base-ctor \ --generate-doxygen $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/name-clash/inheritance/makefile b/tests/cxx/tree/name-clash/inheritance/makefile index 43960fa..d6258ab 100644 --- a/tests/cxx/tree/name-clash/inheritance/makefile +++ b/tests/cxx/tree/name-clash/inheritance/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-ostream $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/naming/camel/makefile b/tests/cxx/tree/naming/camel/makefile index e4041d1..b7f862f 100644 --- a/tests/cxx/tree/naming/camel/makefile +++ b/tests/cxx/tree/naming/camel/makefile @@ -45,7 +45,7 @@ $(gen): xsd_options := \ $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/naming/java/makefile b/tests/cxx/tree/naming/java/makefile index de7413a..a7d8b29 100644 --- a/tests/cxx/tree/naming/java/makefile +++ b/tests/cxx/tree/naming/java/makefile @@ -45,7 +45,7 @@ $(gen): xsd_options := \ $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/naming/knr/makefile b/tests/cxx/tree/naming/knr/makefile index 1104321..0baf083 100644 --- a/tests/cxx/tree/naming/knr/makefile +++ b/tests/cxx/tree/naming/knr/makefile @@ -45,7 +45,7 @@ $(gen): xsd_options := \ $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/polymorphism/comparison/makefile b/tests/cxx/tree/polymorphism/comparison/makefile index a52ab6e..5fe465f 100644 --- a/tests/cxx/tree/polymorphism/comparison/makefile +++ b/tests/cxx/tree/polymorphism/comparison/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-polymorphic --polymorphic-type base \ --generate-comparison $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/polymorphism/ostream/makefile b/tests/cxx/tree/polymorphism/ostream/makefile index 777d716..daf31ce 100644 --- a/tests/cxx/tree/polymorphism/ostream/makefile +++ b/tests/cxx/tree/polymorphism/ostream/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-polymorphic --polymorphic-type-all \ --root-element root --generate-ostream $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/polymorphism/same-type/makefile b/tests/cxx/tree/polymorphism/same-type/makefile index 25b0117..3c66ef5 100644 --- a/tests/cxx/tree/polymorphism/same-type/makefile +++ b/tests/cxx/tree/polymorphism/same-type/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-ostream --generate-polymorphic \ --root-element root $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/prefix/makefile b/tests/cxx/tree/prefix/makefile index a0b4778..304ceef 100644 --- a/tests/cxx/tree/prefix/makefile +++ b/tests/cxx/tree/prefix/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-serialization --generate-polymorphic \ --polymorphic-type foo\#base --root-element root $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/test-template/makefile b/tests/cxx/tree/test-template/makefile index 31e652a..9fdec91 100644 --- a/tests/cxx/tree/test-template/makefile +++ b/tests/cxx/tree/test-template/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-ostream $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/types-only/makefile b/tests/cxx/tree/types-only/makefile index 6846e9f..4b19ab7 100644 --- a/tests/cxx/tree/types-only/makefile +++ b/tests/cxx/tree/types-only/makefile @@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --suppress-parsing $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/union/ctor/makefile b/tests/cxx/tree/union/ctor/makefile index 980f6f4..53b1055 100644 --- a/tests/cxx/tree/union/ctor/makefile +++ b/tests/cxx/tree/union/ctor/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-default-ctor --generate-from-base-ctor \ --generate-doxygen $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/tests/cxx/tree/wildcard/makefile b/tests/cxx/tree/wildcard/makefile index 30aa5b1..0886cf2 100644 --- a/tests/cxx/tree/wildcard/makefile +++ b/tests/cxx/tree/wildcard/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-wildcard --generate-default-ctor \ --generate-from-base-ctor --generate-serialization --generate-comparison $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # -- cgit v1.1