From e897aa91a2a5c68a2f795f6a0a995600f13a85f8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 14 May 2014 21:29:29 -0700 Subject: Convert to extension-less headers for API --- examples/hybrid/dom.cxx | 4 ++-- examples/hybrid/dom.hxx | 4 ++-- examples/hybrid/driver.cxx | 4 ++-- examples/hybrid/makefile | 2 +- examples/inheritance/driver.cxx | 4 ++-- examples/inheritance/position.cxx | 4 ++-- examples/inheritance/position.hxx | 2 +- examples/performance/driver.cxx | 2 +- examples/persistence/driver.cxx | 4 ++-- examples/persistence/position.cxx | 4 ++-- examples/persistence/position.hxx | 2 +- examples/processing/driver.cxx | 6 +++--- examples/roundtrip/driver.cxx | 4 ++-- examples/template/Makefile.am | 6 ++++++ 14 files changed, 29 insertions(+), 23 deletions(-) (limited to 'examples') diff --git a/examples/hybrid/dom.cxx b/examples/hybrid/dom.cxx index cd1e0e0..c2ae6fd 100644 --- a/examples/hybrid/dom.cxx +++ b/examples/hybrid/dom.cxx @@ -1,8 +1,8 @@ // file : examples/hybrid/dom.cxx // copyright : not copyrighted - public domain -#include -#include +#include +#include #include "dom.hxx" diff --git a/examples/hybrid/dom.hxx b/examples/hybrid/dom.hxx index 3e1f8e3..4d99feb 100644 --- a/examples/hybrid/dom.hxx +++ b/examples/hybrid/dom.hxx @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include // A simple, DOM-like in-memory representation of raw XML. It only supports // empty, simple, and complex content (no mixed content) and is not diff --git a/examples/hybrid/driver.cxx b/examples/hybrid/driver.cxx index ca7421a..c1f5a0e 100644 --- a/examples/hybrid/driver.cxx +++ b/examples/hybrid/driver.cxx @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "dom.hxx" diff --git a/examples/hybrid/makefile b/examples/hybrid/makefile index 8e4a4f8..fe9439b 100644 --- a/examples/hybrid/makefile +++ b/examples/hybrid/makefile @@ -32,7 +32,7 @@ $(out_base)/: $(driver) # $(dist): name := $(subst $(src_root)/examples/,,$(src_base)) $(dist): sources := $(cxx_tun) -$(dist): extras := README dom.xml +$(dist): extras := README position.xml $(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) $(dist): export extra_headers := dom.hxx $(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ diff --git a/examples/inheritance/driver.cxx b/examples/inheritance/driver.cxx index d6cd5ea..c07a0ea 100644 --- a/examples/inheritance/driver.cxx +++ b/examples/inheritance/driver.cxx @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "position.hxx" diff --git a/examples/inheritance/position.cxx b/examples/inheritance/position.cxx index 9dde29e..1123efa 100644 --- a/examples/inheritance/position.cxx +++ b/examples/inheritance/position.cxx @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include "position.hxx" diff --git a/examples/inheritance/position.hxx b/examples/inheritance/position.hxx index d86995d..d6f3a3f 100644 --- a/examples/inheritance/position.hxx +++ b/examples/inheritance/position.hxx @@ -8,7 +8,7 @@ #include #include -#include // xml::{parser,serializer} forward declarations. +#include // xml::{parser,serializer} forward declarations. class position { diff --git a/examples/performance/driver.cxx b/examples/performance/driver.cxx index 7d096d6..403e821 100644 --- a/examples/performance/driver.cxx +++ b/examples/performance/driver.cxx @@ -5,7 +5,7 @@ #include #include -#include +#include #include "time.hxx" diff --git a/examples/persistence/driver.cxx b/examples/persistence/driver.cxx index d62dd3b..8792716 100644 --- a/examples/persistence/driver.cxx +++ b/examples/persistence/driver.cxx @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "position.hxx" diff --git a/examples/persistence/position.cxx b/examples/persistence/position.cxx index 9f4f701..a0430b4 100644 --- a/examples/persistence/position.cxx +++ b/examples/persistence/position.cxx @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include "position.hxx" diff --git a/examples/persistence/position.hxx b/examples/persistence/position.hxx index 26b04f5..fb8c897 100644 --- a/examples/persistence/position.hxx +++ b/examples/persistence/position.hxx @@ -8,7 +8,7 @@ #include #include -#include // xml::{parser,serializer} forward declarations. +#include // xml::{parser,serializer} forward declarations. enum object_type {building, mountain}; diff --git a/examples/processing/driver.cxx b/examples/processing/driver.cxx index 97669c5..18950b2 100644 --- a/examples/processing/driver.cxx +++ b/examples/processing/driver.cxx @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace std; using namespace xml; diff --git a/examples/roundtrip/driver.cxx b/examples/roundtrip/driver.cxx index b83988b..9b8d512 100644 --- a/examples/roundtrip/driver.cxx +++ b/examples/roundtrip/driver.cxx @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace xml; diff --git a/examples/template/Makefile.am b/examples/template/Makefile.am index 64e4d1f..37d9509 100644 --- a/examples/template/Makefile.am +++ b/examples/template/Makefile.am @@ -11,3 +11,9 @@ AM_CPPFLAGS = -I'$(top_builddir)' -I'$(top_srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=example=1; export example; + +# Make sure make doesn't try to build the no-extension headers +# thinking that they are executable. Those are pulled in through +# auto-generated dependencies. +# +__foreach_w__(__f,__path__(xml_headers),$(top_srcdir)/xml/__f ): ; @: -- cgit v1.1