From d5dcd2e6ec2a2344da44b8e5cbfe319957318dba Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 25 Feb 2014 09:50:18 +0200
Subject: Add support for manual dependency tracking in tests and examples

---
 tests/cxx/hybrid/binary/cdr/makefile               | 2 +-
 tests/cxx/hybrid/binary/custom/makefile            | 2 +-
 tests/cxx/hybrid/binary/xdr/makefile               | 2 +-
 tests/cxx/hybrid/built-in/makefile                 | 2 +-
 tests/cxx/hybrid/choice/makefile                   | 2 +-
 tests/cxx/hybrid/clone/makefile                    | 2 +-
 tests/cxx/hybrid/default/makefile                  | 2 +-
 tests/cxx/hybrid/enumeration/makefile              | 2 +-
 tests/cxx/hybrid/facets/makefile                   | 2 +-
 tests/cxx/hybrid/iso8859-1/makefile                | 2 +-
 tests/cxx/hybrid/iterator/makefile                 | 2 +-
 tests/cxx/hybrid/list/makefile                     | 2 +-
 tests/cxx/hybrid/pattern/makefile                  | 2 +-
 tests/cxx/hybrid/polymorphism/any-type/makefile    | 2 +-
 tests/cxx/hybrid/polymorphism/enumeration/makefile | 2 +-
 tests/cxx/hybrid/polymorphism/multischema/makefile | 2 +-
 tests/cxx/hybrid/recursive/makefile                | 2 +-
 tests/cxx/hybrid/sequences/makefile                | 2 +-
 tests/cxx/hybrid/test-template/makefile            | 2 +-
 tests/cxx/hybrid/union/makefile                    | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'tests/cxx/hybrid')

diff --git a/tests/cxx/hybrid/binary/cdr/makefile b/tests/cxx/hybrid/binary/cdr/makefile
index 0b8f10f..c104d1c 100644
--- a/tests/cxx/hybrid/binary/cdr/makefile
+++ b/tests/cxx/hybrid/binary/cdr/makefile
@@ -47,7 +47,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate --generate-extraction CDR \
 --generate-insertion CDR
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/binary/custom/makefile b/tests/cxx/hybrid/binary/custom/makefile
index 1d97162..e82f628 100644
--- a/tests/cxx/hybrid/binary/custom/makefile
+++ b/tests/cxx/hybrid/binary/custom/makefile
@@ -59,7 +59,7 @@ $(xsde_options) xml-schema.xsd)
 
 genf += xml-schema.hxx xml-schema-pskel.hxx xml-schema-sskel.hxx
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/binary/xdr/makefile b/tests/cxx/hybrid/binary/xdr/makefile
index c2a2eb7..aa2fb69 100644
--- a/tests/cxx/hybrid/binary/xdr/makefile
+++ b/tests/cxx/hybrid/binary/xdr/makefile
@@ -48,7 +48,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate --generate-extraction XDR \
 --generate-insertion XDR
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/built-in/makefile b/tests/cxx/hybrid/built-in/makefile
index 47af8ca..700931c 100644
--- a/tests/cxx/hybrid/built-in/makefile
+++ b/tests/cxx/hybrid/built-in/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/choice/makefile b/tests/cxx/hybrid/choice/makefile
index 13f6816..b455f79 100644
--- a/tests/cxx/hybrid/choice/makefile
+++ b/tests/cxx/hybrid/choice/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/clone/makefile b/tests/cxx/hybrid/clone/makefile
index be676ad..f51fee1 100644
--- a/tests/cxx/hybrid/clone/makefile
+++ b/tests/cxx/hybrid/clone/makefile
@@ -48,7 +48,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate --generate-clone \
 --custom-data complex
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/default/makefile b/tests/cxx/hybrid/default/makefile
index aa614b0..8816b04 100644
--- a/tests/cxx/hybrid/default/makefile
+++ b/tests/cxx/hybrid/default/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/enumeration/makefile b/tests/cxx/hybrid/enumeration/makefile
index 1767642..7d7e604 100644
--- a/tests/cxx/hybrid/enumeration/makefile
+++ b/tests/cxx/hybrid/enumeration/makefile
@@ -48,7 +48,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate --custom-data simple-cd \
 --custom-data fbvd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/facets/makefile b/tests/cxx/hybrid/facets/makefile
index ff11745..c893616 100644
--- a/tests/cxx/hybrid/facets/makefile
+++ b/tests/cxx/hybrid/facets/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/iso8859-1/makefile b/tests/cxx/hybrid/iso8859-1/makefile
index fa21ffd..1a86757 100644
--- a/tests/cxx/hybrid/iso8859-1/makefile
+++ b/tests/cxx/hybrid/iso8859-1/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/iterator/makefile b/tests/cxx/hybrid/iterator/makefile
index bd0a1bb..a25f450 100644
--- a/tests/cxx/hybrid/iterator/makefile
+++ b/tests/cxx/hybrid/iterator/makefile
@@ -34,7 +34,7 @@ $(gen): $(out_root)/xsde/xsde
 $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options +=
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/list/makefile b/tests/cxx/hybrid/list/makefile
index a02d995..f7bd7d1 100644
--- a/tests/cxx/hybrid/list/makefile
+++ b/tests/cxx/hybrid/list/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/pattern/makefile b/tests/cxx/hybrid/pattern/makefile
index 0fb1567..89044be 100644
--- a/tests/cxx/hybrid/pattern/makefile
+++ b/tests/cxx/hybrid/pattern/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/polymorphism/any-type/makefile b/tests/cxx/hybrid/polymorphism/any-type/makefile
index 195c2e4..fb0b251 100644
--- a/tests/cxx/hybrid/polymorphism/any-type/makefile
+++ b/tests/cxx/hybrid/polymorphism/any-type/makefile
@@ -46,7 +46,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --generate-polymorphic --generate-typeinfo \
 --root-element root --polymorphic-type anyType
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/polymorphism/enumeration/makefile b/tests/cxx/hybrid/polymorphism/enumeration/makefile
index 7bb004b..065156b 100644
--- a/tests/cxx/hybrid/polymorphism/enumeration/makefile
+++ b/tests/cxx/hybrid/polymorphism/enumeration/makefile
@@ -49,7 +49,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --custom-data fbvd --generate-polymorphic --generate-typeinfo \
 --polymorphic-type base --polymorphic-type simple
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/polymorphism/multischema/makefile b/tests/cxx/hybrid/polymorphism/multischema/makefile
index 600155e..fcdfa79 100644
--- a/tests/cxx/hybrid/polymorphism/multischema/makefile
+++ b/tests/cxx/hybrid/polymorphism/multischema/makefile
@@ -50,7 +50,7 @@ $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-typeinfo --polymorphic-type base \
 --polymorphic-schema $(src_base)/type.xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/recursive/makefile b/tests/cxx/hybrid/recursive/makefile
index 325908b..1a96580 100644
--- a/tests/cxx/hybrid/recursive/makefile
+++ b/tests/cxx/hybrid/recursive/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/sequences/makefile b/tests/cxx/hybrid/sequences/makefile
index 53a59e4..07028be 100644
--- a/tests/cxx/hybrid/sequences/makefile
+++ b/tests/cxx/hybrid/sequences/makefile
@@ -26,7 +26,7 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/test-template/makefile b/tests/cxx/hybrid/test-template/makefile
index 25c8653..72a6760 100644
--- a/tests/cxx/hybrid/test-template/makefile
+++ b/tests/cxx/hybrid/test-template/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/hybrid/union/makefile b/tests/cxx/hybrid/union/makefile
index ce3e7cb..ce2d6be 100644
--- a/tests/cxx/hybrid/union/makefile
+++ b/tests/cxx/hybrid/union/makefile
@@ -47,7 +47,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen) $(dist) $(dist-win): xsde_options += --generate-parser \
 --generate-serializer --generate-aggregate --generate-detach
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
-- 
cgit v1.1