From 61c48f6d4fc422d9f2a68c99ee5eb2da3cf8a645 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 20 Nov 2013 08:42:24 +0200
Subject: Add support for manual dependency tracking in tests and examples

---
 tests/cxx/parser/built-in/makefile                      | 2 +-
 tests/cxx/parser/enumeration/makefile                   | 2 +-
 tests/cxx/parser/generated-impl/makefile                | 2 +-
 tests/cxx/parser/list/makefile                          | 2 +-
 tests/cxx/parser/name-clash/inheritance/makefile        | 2 +-
 tests/cxx/parser/polymorphism/recursive/makefile        | 2 +-
 tests/cxx/parser/polymorphism/same-type/makefile        | 2 +-
 tests/cxx/parser/recursive/makefile                     | 2 +-
 tests/cxx/parser/test-template/makefile                 | 2 +-
 tests/cxx/parser/union/makefile                         | 2 +-
 tests/cxx/parser/validation/all/makefile                | 2 +-
 tests/cxx/parser/validation/any/makefile                | 2 +-
 tests/cxx/parser/validation/attribute/makefile          | 2 +-
 tests/cxx/parser/validation/built-in/any-type/makefile  | 2 +-
 tests/cxx/parser/validation/built-in/binary/makefile    | 2 +-
 tests/cxx/parser/validation/built-in/boolean/makefile   | 2 +-
 tests/cxx/parser/validation/built-in/byte/makefile      | 2 +-
 tests/cxx/parser/validation/built-in/date-time/makefile | 2 +-
 tests/cxx/parser/validation/built-in/float/makefile     | 2 +-
 tests/cxx/parser/validation/built-in/int/makefile       | 2 +-
 tests/cxx/parser/validation/built-in/integer/makefile   | 2 +-
 tests/cxx/parser/validation/built-in/long/makefile      | 2 +-
 tests/cxx/parser/validation/built-in/qname/makefile     | 2 +-
 tests/cxx/parser/validation/built-in/short/makefile     | 2 +-
 tests/cxx/parser/validation/built-in/string/makefile    | 2 +-
 tests/cxx/parser/validation/built-in/uri/makefile       | 2 +-
 tests/cxx/parser/validation/choice/makefile             | 2 +-
 tests/cxx/parser/validation/restriction/makefile        | 2 +-
 tests/cxx/parser/validation/sequence/makefile           | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'tests/cxx/parser')

diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile
index c661e55..2ad17e9 100644
--- a/tests/cxx/parser/built-in/makefile
+++ b/tests/cxx/parser/built-in/makefile
@@ -34,7 +34,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/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile
index 975bfd6..7d4ab20 100644
--- a/tests/cxx/parser/enumeration/makefile
+++ b/tests/cxx/parser/enumeration/makefile
@@ -35,7 +35,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --type-map $(src_base)/test.map
 $(gen): $(out_root)/xsd/xsd $(src_base)/test.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile
index bb30c89..acd542f 100644
--- a/tests/cxx/parser/generated-impl/makefile
+++ b/tests/cxx/parser/generated-impl/makefile
@@ -42,7 +42,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/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile
index a987d1a..4c149b8 100644
--- a/tests/cxx/parser/list/makefile
+++ b/tests/cxx/parser/list/makefile
@@ -34,7 +34,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/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile
index 30a3397..641f993 100644
--- a/tests/cxx/parser/name-clash/inheritance/makefile
+++ b/tests/cxx/parser/name-clash/inheritance/makefile
@@ -35,7 +35,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/polymorphism/recursive/makefile b/tests/cxx/parser/polymorphism/recursive/makefile
index 4ae706e..595406d 100644
--- a/tests/cxx/parser/polymorphism/recursive/makefile
+++ b/tests/cxx/parser/polymorphism/recursive/makefile
@@ -35,7 +35,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/tests/cxx/parser/polymorphism/same-type/makefile b/tests/cxx/parser/polymorphism/same-type/makefile
index ed131df..7f1ab04 100644
--- a/tests/cxx/parser/polymorphism/same-type/makefile
+++ b/tests/cxx/parser/polymorphism/same-type/makefile
@@ -35,7 +35,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/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile
index a0ad25a..21b80c2 100644
--- a/tests/cxx/parser/recursive/makefile
+++ b/tests/cxx/parser/recursive/makefile
@@ -35,7 +35,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile
index fa552f1..0615b3e 100644
--- a/tests/cxx/parser/test-template/makefile
+++ b/tests/cxx/parser/test-template/makefile
@@ -34,7 +34,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/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile
index 8fcfc14..fad1009 100644
--- a/tests/cxx/parser/union/makefile
+++ b/tests/cxx/parser/union/makefile
@@ -34,7 +34,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/tests/cxx/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile
index f14758f..d772718 100644
--- a/tests/cxx/parser/validation/all/makefile
+++ b/tests/cxx/parser/validation/all/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile
index f0c603b..6e38eaa 100644
--- a/tests/cxx/parser/validation/any/makefile
+++ b/tests/cxx/parser/validation/any/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile
index 18581df..d3571ef 100644
--- a/tests/cxx/parser/validation/attribute/makefile
+++ b/tests/cxx/parser/validation/attribute/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile
index 478c522..4d3ff6e 100644
--- a/tests/cxx/parser/validation/built-in/any-type/makefile
+++ b/tests/cxx/parser/validation/built-in/any-type/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/built-in/binary/makefile b/tests/cxx/parser/validation/built-in/binary/makefile
index 7781caa..8b2d09e 100644
--- a/tests/cxx/parser/validation/built-in/binary/makefile
+++ b/tests/cxx/parser/validation/built-in/binary/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/boolean/makefile b/tests/cxx/parser/validation/built-in/boolean/makefile
index d1f67d3..da5861d 100644
--- a/tests/cxx/parser/validation/built-in/boolean/makefile
+++ b/tests/cxx/parser/validation/built-in/boolean/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/byte/makefile b/tests/cxx/parser/validation/built-in/byte/makefile
index b119b94..2acf537 100644
--- a/tests/cxx/parser/validation/built-in/byte/makefile
+++ b/tests/cxx/parser/validation/built-in/byte/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/date-time/makefile b/tests/cxx/parser/validation/built-in/date-time/makefile
index 8e75e7e..a3856f1 100644
--- a/tests/cxx/parser/validation/built-in/date-time/makefile
+++ b/tests/cxx/parser/validation/built-in/date-time/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/float/makefile b/tests/cxx/parser/validation/built-in/float/makefile
index 0396b54..526bf5d 100644
--- a/tests/cxx/parser/validation/built-in/float/makefile
+++ b/tests/cxx/parser/validation/built-in/float/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/int/makefile b/tests/cxx/parser/validation/built-in/int/makefile
index 4564c41..279a844 100644
--- a/tests/cxx/parser/validation/built-in/int/makefile
+++ b/tests/cxx/parser/validation/built-in/int/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/integer/makefile b/tests/cxx/parser/validation/built-in/integer/makefile
index f5ead41..4a0e3c4 100644
--- a/tests/cxx/parser/validation/built-in/integer/makefile
+++ b/tests/cxx/parser/validation/built-in/integer/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/long/makefile b/tests/cxx/parser/validation/built-in/long/makefile
index a972066..ce710f6 100644
--- a/tests/cxx/parser/validation/built-in/long/makefile
+++ b/tests/cxx/parser/validation/built-in/long/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/qname/makefile b/tests/cxx/parser/validation/built-in/qname/makefile
index 3ecbb93..d887823 100644
--- a/tests/cxx/parser/validation/built-in/qname/makefile
+++ b/tests/cxx/parser/validation/built-in/qname/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/short/makefile b/tests/cxx/parser/validation/built-in/short/makefile
index 5bbcc46..81c5433 100644
--- a/tests/cxx/parser/validation/built-in/short/makefile
+++ b/tests/cxx/parser/validation/built-in/short/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/string/makefile b/tests/cxx/parser/validation/built-in/string/makefile
index 0d9d846..d20c612 100644
--- a/tests/cxx/parser/validation/built-in/string/makefile
+++ b/tests/cxx/parser/validation/built-in/string/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/built-in/uri/makefile b/tests/cxx/parser/validation/built-in/uri/makefile
index 4475268..5174a46 100644
--- a/tests/cxx/parser/validation/built-in/uri/makefile
+++ b/tests/cxx/parser/validation/built-in/uri/makefile
@@ -28,7 +28,7 @@ $(driver): $(obj) $(xerces_c.l)
 $(obj) $(dep): cpp_options := -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/tests/cxx/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile
index 2c1123c..cf38433 100644
--- a/tests/cxx/parser/validation/choice/makefile
+++ b/tests/cxx/parser/validation/choice/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile
index 90b9f1c..5f58a0b 100644
--- a/tests/cxx/parser/validation/restriction/makefile
+++ b/tests/cxx/parser/validation/restriction/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(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/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile
index 9f7a0f6..995c2f2 100644
--- a/tests/cxx/parser/validation/sequence/makefile
+++ b/tests/cxx/parser/validation/sequence/makefile
@@ -37,7 +37,7 @@ $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-validation
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 
 # Convenience alias for default target.
-- 
cgit v1.1