From b3b1a1d789d06c8d5ad5c93ae1c5a3c6a5e7fdff Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Nov 2013 09:08:24 +0200 Subject: Enable by default generation of inline files in build rules for XSD --- 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 | 4 ++-- examples/cxx/tree/custom/mixed/makefile | 2 +- examples/cxx/tree/custom/taxonomy/makefile | 2 +- examples/cxx/tree/custom/wildcard/makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'examples/cxx/tree/custom') diff --git a/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile index 656ceab..cc4d9d9 100644 --- a/examples/cxx/tree/custom/calendar/makefile +++ b/examples/cxx/tree/custom/calendar/makefile @@ -51,7 +51,7 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --extern-xml-schema xml-schema.xsd diff --git a/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile index 4138710..6eca039 100644 --- a/examples/cxx/tree/custom/comments/makefile +++ b/examples/cxx/tree/custom/comments/makefile @@ -45,7 +45,7 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd diff --git a/examples/cxx/tree/custom/contacts/makefile b/examples/cxx/tree/custom/contacts/makefile index c3d45f6..6ad6f96 100644 --- a/examples/cxx/tree/custom/contacts/makefile +++ b/examples/cxx/tree/custom/contacts/makefile @@ -40,7 +40,7 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --custom-type contact=/contact_base \ --hxx-epilogue '\#include "contacts-custom.hxx"' diff --git a/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile index ee90e7e..0461bb0 100644 --- a/examples/cxx/tree/custom/double/makefile +++ b/examples/cxx/tree/custom/double/makefile @@ -42,8 +42,8 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := \ ---generate-serialization --extern-xml-schema xml-schema.xsd +$(gen): xsd_options += --generate-serialization \ +--extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/custom/mixed/makefile b/examples/cxx/tree/custom/mixed/makefile index f95c1fe..43a1774 100644 --- a/examples/cxx/tree/custom/mixed/makefile +++ b/examples/cxx/tree/custom/mixed/makefile @@ -40,7 +40,7 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-serialization \ --custom-type bio=/bio_base \ diff --git a/examples/cxx/tree/custom/taxonomy/makefile b/examples/cxx/tree/custom/taxonomy/makefile index 48ba7e8..fdd5636 100644 --- a/examples/cxx/tree/custom/taxonomy/makefile +++ b/examples/cxx/tree/custom/taxonomy/makefile @@ -40,7 +40,7 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-forward \ --generate-polymorphic \ diff --git a/examples/cxx/tree/custom/wildcard/makefile b/examples/cxx/tree/custom/wildcard/makefile index c90526b..7e7a0ee 100644 --- a/examples/cxx/tree/custom/wildcard/makefile +++ b/examples/cxx/tree/custom/wildcard/makefile @@ -40,7 +40,7 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-ostream \ --generate-serialization \ -- cgit v1.1