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 --- examples/cxx/parser/generated/makefile | 2 +- examples/cxx/parser/hello/makefile | 2 +- examples/cxx/parser/library/makefile | 2 +- examples/cxx/parser/mixed/makefile | 2 +- examples/cxx/parser/mixin/makefile | 2 +- examples/cxx/parser/multiroot/makefile | 2 +- examples/cxx/parser/performance/makefile | 2 +- examples/cxx/parser/polymorphism/makefile | 2 +- examples/cxx/parser/polyroot/makefile | 2 +- examples/cxx/parser/wildcard/makefile | 2 +- examples/cxx/tree/binary/boost/makefile | 2 +- examples/cxx/tree/binary/cdr/makefile | 2 +- examples/cxx/tree/binary/xdr/makefile | 2 +- examples/cxx/tree/caching/makefile | 2 +- examples/cxx/tree/compression/makefile | 2 +- examples/cxx/tree/custom/calendar/makefile | 2 +- examples/cxx/tree/custom/comments/makefile | 2 +- examples/cxx/tree/custom/contacts/makefile | 2 +- examples/cxx/tree/custom/double/makefile | 2 +- examples/cxx/tree/custom/mixed/makefile | 2 +- examples/cxx/tree/custom/taxonomy/makefile | 2 +- examples/cxx/tree/custom/wildcard/makefile | 2 +- examples/cxx/tree/embedded/makefile | 2 +- examples/cxx/tree/hello/makefile | 2 +- examples/cxx/tree/library/makefile | 2 +- examples/cxx/tree/messaging/makefile | 2 +- examples/cxx/tree/mixed/makefile | 2 +- examples/cxx/tree/multiroot/makefile | 2 +- examples/cxx/tree/performance/makefile | 2 +- examples/cxx/tree/polymorphism/makefile | 2 +- examples/cxx/tree/streaming/makefile | 2 +- examples/cxx/tree/wildcard/makefile | 2 +- examples/cxx/tree/xpath/makefile | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) (limited to 'examples') diff --git a/examples/cxx/parser/generated/makefile b/examples/cxx/parser/generated/makefile index 4eadfa0..fefa1f8 100644 --- a/examples/cxx/parser/generated/makefile +++ b/examples/cxx/parser/generated/makefile @@ -45,7 +45,7 @@ $(gen): xsd_options := --generate-print-impl --generate-test-driver \ --force-overwrite $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/hello/makefile b/examples/cxx/parser/hello/makefile index 6811083..21ffdc2 100644 --- a/examples/cxx/parser/hello/makefile +++ b/examples/cxx/parser/hello/makefile @@ -38,7 +38,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/library/makefile b/examples/cxx/parser/library/makefile index d5590b6..4f8082c 100644 --- a/examples/cxx/parser/library/makefile +++ b/examples/cxx/parser/library/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-inline --type-map $(src_base)/library.map $(gen): $(out_root)/xsd/xsd $(src_base)/library.map -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/mixed/makefile b/examples/cxx/parser/mixed/makefile index f616b88..7feca93 100644 --- a/examples/cxx/parser/mixed/makefile +++ b/examples/cxx/parser/mixed/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --type-map $(src_base)/text.map $(gen): $(out_root)/xsd/xsd $(src_base)/text.map -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/mixin/makefile b/examples/cxx/parser/mixin/makefile index 945d28b..b30261d 100644 --- a/examples/cxx/parser/mixin/makefile +++ b/examples/cxx/parser/mixin/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --type-map $(src_base)/schema.map $(gen): $(out_root)/xsd/xsd $(src_base)/schema.map -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/multiroot/makefile b/examples/cxx/parser/multiroot/makefile index 51046cf..016a63b 100644 --- a/examples/cxx/parser/multiroot/makefile +++ b/examples/cxx/parser/multiroot/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --type-map $(src_base)/protocol.map $(gen): $(out_root)/xsd/xsd $(src_base)/protocol.map -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/performance/makefile b/examples/cxx/parser/performance/makefile index d2fa512..e8efd93 100644 --- a/examples/cxx/parser/performance/makefile +++ b/examples/cxx/parser/performance/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-inline $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/polymorphism/makefile b/examples/cxx/parser/polymorphism/makefile index 36805f3..17fc38a 100644 --- a/examples/cxx/parser/polymorphism/makefile +++ b/examples/cxx/parser/polymorphism/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-polymorphic $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/polyroot/makefile b/examples/cxx/parser/polyroot/makefile index 6cb31e7..c0a8020 100644 --- a/examples/cxx/parser/polyroot/makefile +++ b/examples/cxx/parser/polyroot/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-polymorphic $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/parser/wildcard/makefile b/examples/cxx/parser/wildcard/makefile index a6ad403..0179361 100644 --- a/examples/cxx/parser/wildcard/makefile +++ b/examples/cxx/parser/wildcard/makefile @@ -38,7 +38,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/tree/binary/boost/makefile b/examples/cxx/tree/binary/boost/makefile index faaf7d6..2a2c297 100644 --- a/examples/cxx/tree/binary/boost/makefile +++ b/examples/cxx/tree/binary/boost/makefile @@ -50,7 +50,7 @@ $(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/examples/cxx/tree/binary/cdr/makefile b/examples/cxx/tree/binary/cdr/makefile index 58045d7..d09b730 100644 --- a/examples/cxx/tree/binary/cdr/makefile +++ b/examples/cxx/tree/binary/cdr/makefile @@ -46,7 +46,7 @@ $(gen): xsd_options := --generate-ostream \ --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/examples/cxx/tree/binary/xdr/makefile b/examples/cxx/tree/binary/xdr/makefile index 20469f8..55613a8 100644 --- a/examples/cxx/tree/binary/xdr/makefile +++ b/examples/cxx/tree/binary/xdr/makefile @@ -38,7 +38,7 @@ $(gen): xsd_options := --generate-ostream \ --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/examples/cxx/tree/caching/makefile b/examples/cxx/tree/caching/makefile index a30effb..eb05222 100644 --- a/examples/cxx/tree/caching/makefile +++ b/examples/cxx/tree/caching/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(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/examples/cxx/tree/compression/makefile b/examples/cxx/tree/compression/makefile index c5589d4..04c867d 100644 --- a/examples/cxx/tree/compression/makefile +++ b/examples/cxx/tree/compression/makefile @@ -44,7 +44,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-ostream --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/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile index d28be1c..656ceab 100644 --- a/examples/cxx/tree/custom/calendar/makefile +++ b/examples/cxx/tree/custom/calendar/makefile @@ -57,7 +57,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/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile index a39719b..4138710 100644 --- a/examples/cxx/tree/custom/comments/makefile +++ b/examples/cxx/tree/custom/comments/makefile @@ -52,7 +52,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/examples/cxx/tree/custom/contacts/makefile b/examples/cxx/tree/custom/contacts/makefile index 2cb58fc..c3d45f6 100644 --- a/examples/cxx/tree/custom/contacts/makefile +++ b/examples/cxx/tree/custom/contacts/makefile @@ -47,7 +47,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/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile index 9b33821..ee90e7e 100644 --- a/examples/cxx/tree/custom/double/makefile +++ b/examples/cxx/tree/custom/double/makefile @@ -47,7 +47,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/examples/cxx/tree/custom/mixed/makefile b/examples/cxx/tree/custom/mixed/makefile index e91c085..f95c1fe 100644 --- a/examples/cxx/tree/custom/mixed/makefile +++ b/examples/cxx/tree/custom/mixed/makefile @@ -48,7 +48,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/examples/cxx/tree/custom/taxonomy/makefile b/examples/cxx/tree/custom/taxonomy/makefile index 3771bed..48ba7e8 100644 --- a/examples/cxx/tree/custom/taxonomy/makefile +++ b/examples/cxx/tree/custom/taxonomy/makefile @@ -53,7 +53,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/examples/cxx/tree/custom/wildcard/makefile b/examples/cxx/tree/custom/wildcard/makefile index ce78ffd..c90526b 100644 --- a/examples/cxx/tree/custom/wildcard/makefile +++ b/examples/cxx/tree/custom/wildcard/makefile @@ -49,7 +49,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/examples/cxx/tree/embedded/makefile b/examples/cxx/tree/embedded/makefile index 4fb586b..ffc9ded 100644 --- a/examples/cxx/tree/embedded/makefile +++ b/examples/cxx/tree/embedded/makefile @@ -50,7 +50,7 @@ $(out_base)/%: xsdbin := $(xsdbin) $(out_base)/%-schema.hxx $(out_base)/%-schema.cxx: $(src_base)/%.xsd $(xsdbin) $(call message,xsdbin $<,$(xsdbin) --output-dir $(out_base) $<) -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/tree/hello/makefile b/examples/cxx/tree/hello/makefile index 9334039..a2662a5 100644 --- a/examples/cxx/tree/hello/makefile +++ b/examples/cxx/tree/hello/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(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/examples/cxx/tree/library/makefile b/examples/cxx/tree/library/makefile index d5681de..d984aaa 100644 --- a/examples/cxx/tree/library/makefile +++ b/examples/cxx/tree/library/makefile @@ -40,7 +40,7 @@ $(gen): xsd_options := --generate-inline --generate-ostream \ --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/examples/cxx/tree/messaging/makefile b/examples/cxx/tree/messaging/makefile index a3705f2..31a67a4 100644 --- a/examples/cxx/tree/messaging/makefile +++ b/examples/cxx/tree/messaging/makefile @@ -42,7 +42,7 @@ $(gen): xsd_options := --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/examples/cxx/tree/mixed/makefile b/examples/cxx/tree/mixed/makefile index 85ea792..9da0d41 100644 --- a/examples/cxx/tree/mixed/makefile +++ b/examples/cxx/tree/mixed/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(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/examples/cxx/tree/multiroot/makefile b/examples/cxx/tree/multiroot/makefile index cbb0063..6c0e9ec 100644 --- a/examples/cxx/tree/multiroot/makefile +++ b/examples/cxx/tree/multiroot/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --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/examples/cxx/tree/performance/makefile b/examples/cxx/tree/performance/makefile index 70fb1ef..d3e29b6 100644 --- a/examples/cxx/tree/performance/makefile +++ b/examples/cxx/tree/performance/makefile @@ -39,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-inline --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/examples/cxx/tree/polymorphism/makefile b/examples/cxx/tree/polymorphism/makefile index e6ad998..aadb79e 100644 --- a/examples/cxx/tree/polymorphism/makefile +++ b/examples/cxx/tree/polymorphism/makefile @@ -40,7 +40,7 @@ $(gen): xsd_options := --generate-polymorphic --generate-serialization \ --root-element-last $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. diff --git a/examples/cxx/tree/streaming/makefile b/examples/cxx/tree/streaming/makefile index 3868bc8..9e07aec 100644 --- a/examples/cxx/tree/streaming/makefile +++ b/examples/cxx/tree/streaming/makefile @@ -39,7 +39,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/examples/cxx/tree/wildcard/makefile b/examples/cxx/tree/wildcard/makefile index 11b6473..d0c47b7 100644 --- a/examples/cxx/tree/wildcard/makefile +++ b/examples/cxx/tree/wildcard/makefile @@ -40,7 +40,7 @@ $(gen): xsd_options := --generate-inline --generate-wildcard \ --generate-serialization --root-element message $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # diff --git a/examples/cxx/tree/xpath/makefile b/examples/cxx/tree/xpath/makefile index b3164a0..0bf123e 100644 --- a/examples/cxx/tree/xpath/makefile +++ b/examples/cxx/tree/xpath/makefile @@ -45,7 +45,7 @@ $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # -- cgit v1.1