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

---
 examples/cxx/hybrid/allocator/makefile             | 2 +-
 examples/cxx/hybrid/binary/cdr/makefile            | 2 +-
 examples/cxx/hybrid/binary/custom/makefile         | 2 +-
 examples/cxx/hybrid/binary/xdr/makefile            | 2 +-
 examples/cxx/hybrid/compositors/makefile           | 2 +-
 examples/cxx/hybrid/custom/wildcard/makefile       | 2 +-
 examples/cxx/hybrid/evolution/ignore/makefile      | 2 +-
 examples/cxx/hybrid/evolution/passthrough/makefile | 2 +-
 examples/cxx/hybrid/filter/makefile                | 2 +-
 examples/cxx/hybrid/hello/makefile                 | 2 +-
 examples/cxx/hybrid/library/makefile               | 2 +-
 examples/cxx/hybrid/minimal/makefile               | 2 +-
 examples/cxx/hybrid/multiroot/makefile             | 2 +-
 examples/cxx/hybrid/polymorphism/makefile          | 2 +-
 examples/cxx/hybrid/polyroot/makefile              | 2 +-
 examples/cxx/hybrid/streaming/makefile             | 2 +-
 examples/cxx/hybrid/wildcard/makefile              | 2 +-
 examples/cxx/parser/generated/makefile             | 2 +-
 examples/cxx/parser/hello/makefile                 | 2 +-
 examples/cxx/parser/library/makefile               | 2 +-
 examples/cxx/parser/minimal/makefile               | 2 +-
 examples/cxx/parser/mixed/makefile                 | 2 +-
 examples/cxx/parser/multiroot/makefile             | 2 +-
 examples/cxx/parser/polymorphism/makefile          | 2 +-
 examples/cxx/parser/polyroot/makefile              | 2 +-
 examples/cxx/parser/wildcard/makefile              | 2 +-
 examples/cxx/serializer/hello/makefile             | 2 +-
 examples/cxx/serializer/library/makefile           | 2 +-
 examples/cxx/serializer/minimal/makefile           | 2 +-
 examples/cxx/serializer/polymorphism/makefile      | 2 +-
 examples/cxx/serializer/polyroot/makefile          | 2 +-
 examples/cxx/serializer/wildcard/makefile          | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'examples/cxx')

diff --git a/examples/cxx/hybrid/allocator/makefile b/examples/cxx/hybrid/allocator/makefile
index 758cec8..acdd61e 100644
--- a/examples/cxx/hybrid/allocator/makefile
+++ b/examples/cxx/hybrid/allocator/makefile
@@ -45,7 +45,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): 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/examples/cxx/hybrid/binary/cdr/makefile b/examples/cxx/hybrid/binary/cdr/makefile
index 49cfd5b..18f8639 100644
--- a/examples/cxx/hybrid/binary/cdr/makefile
+++ b/examples/cxx/hybrid/binary/cdr/makefile
@@ -45,7 +45,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --generate-insertion CDR --generate-extraction CDR
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/binary/custom/makefile b/examples/cxx/hybrid/binary/custom/makefile
index 0f523f0..d8ff209 100644
--- a/examples/cxx/hybrid/binary/custom/makefile
+++ b/examples/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/examples/cxx/hybrid/binary/xdr/makefile b/examples/cxx/hybrid/binary/xdr/makefile
index 24fc1de..8bc169e 100644
--- a/examples/cxx/hybrid/binary/xdr/makefile
+++ b/examples/cxx/hybrid/binary/xdr/makefile
@@ -45,7 +45,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --generate-insertion XDR --generate-extraction XDR
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/compositors/makefile b/examples/cxx/hybrid/compositors/makefile
index 313c98f..543f041 100644
--- a/examples/cxx/hybrid/compositors/makefile
+++ b/examples/cxx/hybrid/compositors/makefile
@@ -32,7 +32,7 @@ $(gen): $(out_root)/xsde/xsde
 $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-inline
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/custom/wildcard/makefile b/examples/cxx/hybrid/custom/wildcard/makefile
index 9972e8f..0faa262 100644
--- a/examples/cxx/hybrid/custom/wildcard/makefile
+++ b/examples/cxx/hybrid/custom/wildcard/makefile
@@ -49,7 +49,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --custom-serializer envelope=envelope_base_simpl/envelope-simpl.hxx \
 --hxx-epilogue '\#include "body.hxx"'
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/evolution/ignore/makefile b/examples/cxx/hybrid/evolution/ignore/makefile
index 75c75b4..6248c87 100644
--- a/examples/cxx/hybrid/evolution/ignore/makefile
+++ b/examples/cxx/hybrid/evolution/ignore/makefile
@@ -41,7 +41,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-aggregate \
 --root-element transformations --generate-polymorphic
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/evolution/passthrough/makefile b/examples/cxx/hybrid/evolution/passthrough/makefile
index 0b27e83..8de33d9 100644
--- a/examples/cxx/hybrid/evolution/passthrough/makefile
+++ b/examples/cxx/hybrid/evolution/passthrough/makefile
@@ -49,7 +49,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --custom-parser unknown_type=unknown_type_base_pimpl/unknown-type-pimpl.hxx \
 --custom-serializer unknown_type=unknown_type_base_simpl/unknown-type-simpl.hxx
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/filter/makefile b/examples/cxx/hybrid/filter/makefile
index 4d496b4..442df5b 100644
--- a/examples/cxx/hybrid/filter/makefile
+++ b/examples/cxx/hybrid/filter/makefile
@@ -47,7 +47,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --custom-parser people=people_base_pimpl/people-custom-pimpl.hxx \
 --custom-serializer people=people_base_simpl/people-custom-simpl.hxx
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/hello/makefile b/examples/cxx/hybrid/hello/makefile
index 777ff3f..e05931a 100644
--- a/examples/cxx/hybrid/hello/makefile
+++ b/examples/cxx/hybrid/hello/makefile
@@ -41,7 +41,7 @@ $(gen): $(out_root)/xsde/xsde
 $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-aggregate
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/library/makefile b/examples/cxx/hybrid/library/makefile
index a20f21e..cc18cb0 100644
--- a/examples/cxx/hybrid/library/makefile
+++ b/examples/cxx/hybrid/library/makefile
@@ -45,7 +45,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --omit-default-attributes
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/minimal/makefile b/examples/cxx/hybrid/minimal/makefile
index 0c2118a..cb0ee12 100644
--- a/examples/cxx/hybrid/minimal/makefile
+++ b/examples/cxx/hybrid/minimal/makefile
@@ -45,7 +45,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): 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/examples/cxx/hybrid/multiroot/makefile b/examples/cxx/hybrid/multiroot/makefile
index 5ef7f07..a35dff5 100644
--- a/examples/cxx/hybrid/multiroot/makefile
+++ b/examples/cxx/hybrid/multiroot/makefile
@@ -41,7 +41,7 @@ $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-aggregate \
 --root-element-all
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/polymorphism/makefile b/examples/cxx/hybrid/polymorphism/makefile
index 4e5b67b..d8bf9e9 100644
--- a/examples/cxx/hybrid/polymorphism/makefile
+++ b/examples/cxx/hybrid/polymorphism/makefile
@@ -46,7 +46,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --generate-polymorphic --generate-typeinfo \
 --root-element supermen
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/polyroot/makefile b/examples/cxx/hybrid/polyroot/makefile
index 80ffbcf..914b099 100644
--- a/examples/cxx/hybrid/polyroot/makefile
+++ b/examples/cxx/hybrid/polyroot/makefile
@@ -46,7 +46,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --generate-polymorphic --generate-typeinfo \
 --root-element person
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/streaming/makefile b/examples/cxx/hybrid/streaming/makefile
index 6f872ee..6f1e9c4 100644
--- a/examples/cxx/hybrid/streaming/makefile
+++ b/examples/cxx/hybrid/streaming/makefile
@@ -46,7 +46,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --generate-aggregate --custom-parser object=/object-pimpl.hxx \
 --custom-serializer object=/object-simpl.hxx
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/hybrid/wildcard/makefile b/examples/cxx/hybrid/wildcard/makefile
index 348b5ca..1d4e10f 100644
--- a/examples/cxx/hybrid/wildcard/makefile
+++ b/examples/cxx/hybrid/wildcard/makefile
@@ -47,7 +47,7 @@ $(gen): xsde_options += --generate-parser --generate-serializer \
 --custom-parser envelope=envelope_base_pimpl/envelope-pimpl.hxx \
 --custom-serializer envelope=envelope_base_simpl/envelope-simpl.hxx
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/parser/generated/makefile b/examples/cxx/parser/generated/makefile
index 5d94168..12bcf39 100644
--- a/examples/cxx/parser/generated/makefile
+++ b/examples/cxx/parser/generated/makefile
@@ -36,7 +36,7 @@ $(gen): xsde_options += --generate-print-impl --generate-test-driver \
 --force-overwrite
 $(gen): $(out_root)/xsde/xsde
 
-$(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 0696909..ccf7a81 100644
--- a/examples/cxx/parser/hello/makefile
+++ b/examples/cxx/parser/hello/makefile
@@ -33,7 +33,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
 
-$(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 937a0d0..bc39cb8 100644
--- a/examples/cxx/parser/library/makefile
+++ b/examples/cxx/parser/library/makefile
@@ -41,7 +41,7 @@ $(skel): xsde_options += --generate-inline --type-map $(src_base)/library.map
 
 $(skel): $(out_root)/xsde/xsde $(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/minimal/makefile b/examples/cxx/parser/minimal/makefile
index 75d38e6..befe0a8 100644
--- a/examples/cxx/parser/minimal/makefile
+++ b/examples/cxx/parser/minimal/makefile
@@ -35,7 +35,7 @@ $(skel): xsde_options += --type-map $(src_base)/people.map
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/people.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 95076e9..9dcfc94 100644
--- a/examples/cxx/parser/mixed/makefile
+++ b/examples/cxx/parser/mixed/makefile
@@ -35,7 +35,7 @@ $(skel): xsde_options += --type-map $(src_base)/text.map
 
 $(skel): $(out_root)/xsde/xsde $(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/multiroot/makefile b/examples/cxx/parser/multiroot/makefile
index 0625cea..f03de6e 100644
--- a/examples/cxx/parser/multiroot/makefile
+++ b/examples/cxx/parser/multiroot/makefile
@@ -40,7 +40,7 @@ $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): xsde_options += --type-map $(src_base)/protocol.map
 $(skel): $(out_root)/xsde/xsde $(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/polymorphism/makefile b/examples/cxx/parser/polymorphism/makefile
index a4ea2b3..e1a2da4 100644
--- a/examples/cxx/parser/polymorphism/makefile
+++ b/examples/cxx/parser/polymorphism/makefile
@@ -40,7 +40,7 @@ $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): xsde_options += --generate-polymorphic
 $(skel): $(out_root)/xsde/xsde
 
-$(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 251ba8c..3b10e28 100644
--- a/examples/cxx/parser/polyroot/makefile
+++ b/examples/cxx/parser/polyroot/makefile
@@ -40,7 +40,7 @@ $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): xsde_options += --generate-polymorphic
 $(skel): $(out_root)/xsde/xsde
 
-$(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 1e2501c..6debecf 100644
--- a/examples/cxx/parser/wildcard/makefile
+++ b/examples/cxx/parser/wildcard/makefile
@@ -33,7 +33,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/hello/makefile b/examples/cxx/serializer/hello/makefile
index f640217..cac7771 100644
--- a/examples/cxx/serializer/hello/makefile
+++ b/examples/cxx/serializer/hello/makefile
@@ -33,7 +33,7 @@ skel  := $(addprefix $(out_base)/,$(skelf))
 $(skel): xsde := $(out_root)/xsde/xsde
 $(skel): $(out_root)/xsde/xsde
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/library/makefile b/examples/cxx/serializer/library/makefile
index da09800..37e2af2 100644
--- a/examples/cxx/serializer/library/makefile
+++ b/examples/cxx/serializer/library/makefile
@@ -41,7 +41,7 @@ $(skel): xsde_options += --generate-inline --type-map $(src_base)/library.map
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/library.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/minimal/makefile b/examples/cxx/serializer/minimal/makefile
index 7623cb8..c71f680 100644
--- a/examples/cxx/serializer/minimal/makefile
+++ b/examples/cxx/serializer/minimal/makefile
@@ -35,7 +35,7 @@ $(skel): xsde_options += --type-map $(src_base)/people.map
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/people.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/polymorphism/makefile b/examples/cxx/serializer/polymorphism/makefile
index 91199d3..a8fdaf4 100644
--- a/examples/cxx/serializer/polymorphism/makefile
+++ b/examples/cxx/serializer/polymorphism/makefile
@@ -42,7 +42,7 @@ $(skel): xsde_options += --generate-polymorphic \
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/supermen.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/polyroot/makefile b/examples/cxx/serializer/polyroot/makefile
index 5d9020d..c511a61 100644
--- a/examples/cxx/serializer/polyroot/makefile
+++ b/examples/cxx/serializer/polyroot/makefile
@@ -42,7 +42,7 @@ $(skel): xsde_options += --generate-polymorphic \
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/supermen.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
diff --git a/examples/cxx/serializer/wildcard/makefile b/examples/cxx/serializer/wildcard/makefile
index f66d1f4..35deda6 100644
--- a/examples/cxx/serializer/wildcard/makefile
+++ b/examples/cxx/serializer/wildcard/makefile
@@ -35,7 +35,7 @@ $(skel): xsde_options += --type-map $(src_base)/email.map
 
 $(skel): $(out_root)/xsde/xsde $(src_base)/email.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
-- 
cgit v1.1