From 4de101ac6a2c078bbbf63744d1aaabb459025668 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Oct 2009 07:35:03 +0200
Subject: Use proper options to suppress validation

---
 dist/examples/cxx/hybrid/binary/cdr/makefile       | 6 +++++-
 dist/examples/cxx/hybrid/binary/cdr/nmakefile      | 6 +++++-
 dist/examples/cxx/hybrid/binary/custom/makefile    | 6 +++++-
 dist/examples/cxx/hybrid/binary/custom/nmakefile   | 6 +++++-
 dist/examples/cxx/hybrid/binary/xdr/makefile       | 6 +++++-
 dist/examples/cxx/hybrid/binary/xdr/nmakefile      | 6 +++++-
 dist/examples/cxx/hybrid/compositors/makefile      | 4 ----
 dist/examples/cxx/hybrid/compositors/nmakefile     | 4 ----
 dist/examples/cxx/hybrid/custom/wildcard/makefile  | 6 +++++-
 dist/examples/cxx/hybrid/custom/wildcard/nmakefile | 6 +++++-
 dist/examples/cxx/hybrid/filter/makefile           | 6 +++++-
 dist/examples/cxx/hybrid/filter/nmakefile          | 6 +++++-
 dist/examples/cxx/hybrid/hello/makefile            | 2 +-
 dist/examples/cxx/hybrid/hello/nmakefile           | 2 +-
 dist/examples/cxx/hybrid/library/makefile          | 6 +++++-
 dist/examples/cxx/hybrid/library/nmakefile         | 6 +++++-
 dist/examples/cxx/hybrid/minimal/makefile          | 6 +++++-
 dist/examples/cxx/hybrid/minimal/nmakefile         | 6 +++++-
 dist/examples/cxx/hybrid/multiroot/makefile        | 2 +-
 dist/examples/cxx/hybrid/multiroot/nmakefile       | 2 +-
 dist/examples/cxx/hybrid/polymorphism/makefile     | 6 +++++-
 dist/examples/cxx/hybrid/polymorphism/nmakefile    | 6 +++++-
 dist/examples/cxx/hybrid/polyroot/makefile         | 6 +++++-
 dist/examples/cxx/hybrid/polyroot/nmakefile        | 6 +++++-
 dist/examples/cxx/hybrid/streaming/makefile        | 6 +++++-
 dist/examples/cxx/hybrid/streaming/nmakefile       | 6 +++++-
 dist/examples/cxx/hybrid/wildcard/makefile         | 6 +++++-
 dist/examples/cxx/hybrid/wildcard/nmakefile        | 6 +++++-
 28 files changed, 114 insertions(+), 34 deletions(-)

diff --git a/dist/examples/cxx/hybrid/binary/cdr/makefile b/dist/examples/cxx/hybrid/binary/cdr/makefile
index 0f2e44d..1453f78 100644
--- a/dist/examples/cxx/hybrid/binary/cdr/makefile
+++ b/dist/examples/cxx/hybrid/binary/cdr/makefile
@@ -17,7 +17,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/binary/cdr/nmakefile b/dist/examples/cxx/hybrid/binary/cdr/nmakefile
index 3ec7fa3..ce9210b 100644
--- a/dist/examples/cxx/hybrid/binary/cdr/nmakefile
+++ b/dist/examples/cxx/hybrid/binary/cdr/nmakefile
@@ -17,7 +17,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/binary/custom/makefile b/dist/examples/cxx/hybrid/binary/custom/makefile
index 63a48bf..9d02861 100644
--- a/dist/examples/cxx/hybrid/binary/custom/makefile
+++ b/dist/examples/cxx/hybrid/binary/custom/makefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/binary/custom/nmakefile b/dist/examples/cxx/hybrid/binary/custom/nmakefile
index 9e20731..00a0964 100644
--- a/dist/examples/cxx/hybrid/binary/custom/nmakefile
+++ b/dist/examples/cxx/hybrid/binary/custom/nmakefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/binary/xdr/makefile b/dist/examples/cxx/hybrid/binary/xdr/makefile
index 2d926ea..257536d 100644
--- a/dist/examples/cxx/hybrid/binary/xdr/makefile
+++ b/dist/examples/cxx/hybrid/binary/xdr/makefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/binary/xdr/nmakefile b/dist/examples/cxx/hybrid/binary/xdr/nmakefile
index 0713b8a..332bbeb 100644
--- a/dist/examples/cxx/hybrid/binary/xdr/nmakefile
+++ b/dist/examples/cxx/hybrid/binary/xdr/nmakefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/compositors/makefile b/dist/examples/cxx/hybrid/compositors/makefile
index 5bdd1d3..dd36b46 100644
--- a/dist/examples/cxx/hybrid/compositors/makefile
+++ b/dist/examples/cxx/hybrid/compositors/makefile
@@ -22,10 +22,6 @@ ifeq ($(XSDE_LONGLONG),n)
 EXTRA_XSDFLAGS += --no-long-long
 endif
 
-ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
-endif
-
 ifeq ($(XSDE_REUSE_STYLE),mixin)
 EXTRA_XSDFLAGS += --reuse-style-mixin
 endif
diff --git a/dist/examples/cxx/hybrid/compositors/nmakefile b/dist/examples/cxx/hybrid/compositors/nmakefile
index 8ac4238..14039ac 100644
--- a/dist/examples/cxx/hybrid/compositors/nmakefile
+++ b/dist/examples/cxx/hybrid/compositors/nmakefile
@@ -22,10 +22,6 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-exceptions
 EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
-!if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
-!endif
-
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
 EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --reuse-style-mixin
 !endif
diff --git a/dist/examples/cxx/hybrid/custom/wildcard/makefile b/dist/examples/cxx/hybrid/custom/wildcard/makefile
index 43b38df..fb85b48 100644
--- a/dist/examples/cxx/hybrid/custom/wildcard/makefile
+++ b/dist/examples/cxx/hybrid/custom/wildcard/makefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/custom/wildcard/nmakefile b/dist/examples/cxx/hybrid/custom/wildcard/nmakefile
index 94992cb..329c993 100644
--- a/dist/examples/cxx/hybrid/custom/wildcard/nmakefile
+++ b/dist/examples/cxx/hybrid/custom/wildcard/nmakefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/filter/makefile b/dist/examples/cxx/hybrid/filter/makefile
index b89536e..586a166 100644
--- a/dist/examples/cxx/hybrid/filter/makefile
+++ b/dist/examples/cxx/hybrid/filter/makefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/filter/nmakefile b/dist/examples/cxx/hybrid/filter/nmakefile
index 4bc4328..6db5615 100644
--- a/dist/examples/cxx/hybrid/filter/nmakefile
+++ b/dist/examples/cxx/hybrid/filter/nmakefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/hello/makefile b/dist/examples/cxx/hybrid/hello/makefile
index 789334f..5499a21 100644
--- a/dist/examples/cxx/hybrid/hello/makefile
+++ b/dist/examples/cxx/hybrid/hello/makefile
@@ -15,7 +15,7 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/hello/nmakefile b/dist/examples/cxx/hybrid/hello/nmakefile
index 6fee8d4..ea80a40 100644
--- a/dist/examples/cxx/hybrid/hello/nmakefile
+++ b/dist/examples/cxx/hybrid/hello/nmakefile
@@ -15,7 +15,7 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/library/makefile b/dist/examples/cxx/hybrid/library/makefile
index 58c99a7..512a0ba 100644
--- a/dist/examples/cxx/hybrid/library/makefile
+++ b/dist/examples/cxx/hybrid/library/makefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/library/nmakefile b/dist/examples/cxx/hybrid/library/nmakefile
index 0d760a0..e1d1a72 100644
--- a/dist/examples/cxx/hybrid/library/nmakefile
+++ b/dist/examples/cxx/hybrid/library/nmakefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/minimal/makefile b/dist/examples/cxx/hybrid/minimal/makefile
index e7f896e..8224235 100644
--- a/dist/examples/cxx/hybrid/minimal/makefile
+++ b/dist/examples/cxx/hybrid/minimal/makefile
@@ -17,7 +17,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/minimal/nmakefile b/dist/examples/cxx/hybrid/minimal/nmakefile
index c76ea37..060be2c 100644
--- a/dist/examples/cxx/hybrid/minimal/nmakefile
+++ b/dist/examples/cxx/hybrid/minimal/nmakefile
@@ -17,7 +17,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/multiroot/makefile b/dist/examples/cxx/hybrid/multiroot/makefile
index cb3f3d0..7329f41 100644
--- a/dist/examples/cxx/hybrid/multiroot/makefile
+++ b/dist/examples/cxx/hybrid/multiroot/makefile
@@ -15,7 +15,7 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/multiroot/nmakefile b/dist/examples/cxx/hybrid/multiroot/nmakefile
index 9a94cd8..d3c4e35 100644
--- a/dist/examples/cxx/hybrid/multiroot/nmakefile
+++ b/dist/examples/cxx/hybrid/multiroot/nmakefile
@@ -15,7 +15,7 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/polymorphism/makefile b/dist/examples/cxx/hybrid/polymorphism/makefile
index 47ad26d..e1f40a1 100644
--- a/dist/examples/cxx/hybrid/polymorphism/makefile
+++ b/dist/examples/cxx/hybrid/polymorphism/makefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/polymorphism/nmakefile b/dist/examples/cxx/hybrid/polymorphism/nmakefile
index 7ff1476..bd86945 100644
--- a/dist/examples/cxx/hybrid/polymorphism/nmakefile
+++ b/dist/examples/cxx/hybrid/polymorphism/nmakefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/polyroot/makefile b/dist/examples/cxx/hybrid/polyroot/makefile
index 5e7d513..a422aa3 100644
--- a/dist/examples/cxx/hybrid/polyroot/makefile
+++ b/dist/examples/cxx/hybrid/polyroot/makefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/polyroot/nmakefile b/dist/examples/cxx/hybrid/polyroot/nmakefile
index 20453eb..d713db0 100644
--- a/dist/examples/cxx/hybrid/polyroot/nmakefile
+++ b/dist/examples/cxx/hybrid/polyroot/nmakefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/streaming/makefile b/dist/examples/cxx/hybrid/streaming/makefile
index a607ff1..6c97f8b 100644
--- a/dist/examples/cxx/hybrid/streaming/makefile
+++ b/dist/examples/cxx/hybrid/streaming/makefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/streaming/nmakefile b/dist/examples/cxx/hybrid/streaming/nmakefile
index 25e6e1b..76a0c14 100644
--- a/dist/examples/cxx/hybrid/streaming/nmakefile
+++ b/dist/examples/cxx/hybrid/streaming/nmakefile
@@ -15,7 +15,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
diff --git a/dist/examples/cxx/hybrid/wildcard/makefile b/dist/examples/cxx/hybrid/wildcard/makefile
index dda8cfc..0c8fd1f 100644
--- a/dist/examples/cxx/hybrid/wildcard/makefile
+++ b/dist/examples/cxx/hybrid/wildcard/makefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS += --no-long-long
 endif
 
 ifeq ($(XSDE_PARSER_VALIDATION),n)
-EXTRA_XSDFLAGS += --suppress-validation
+EXTRA_XSDFLAGS += --suppress-parser-val
+endif
+
+ifeq ($(XSDE_SERIALIZER_VALIDATION),n)
+EXTRA_XSDFLAGS += --suppress-serializer-val
 endif
 
 ifeq ($(XSDE_REUSE_STYLE),mixin)
diff --git a/dist/examples/cxx/hybrid/wildcard/nmakefile b/dist/examples/cxx/hybrid/wildcard/nmakefile
index 689ac2f..d4d8d06 100644
--- a/dist/examples/cxx/hybrid/wildcard/nmakefile
+++ b/dist/examples/cxx/hybrid/wildcard/nmakefile
@@ -11,7 +11,11 @@ EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long
 !endif
 
 !if "$(XSDE_PARSER_VALIDATION)" == "n"
-EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val
+!endif
+
+!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"
+EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val
 !endif
 
 !if "$(XSDE_REUSE_STYLE)" == "mixin"
-- 
cgit v1.1