Convert to extension-less headers for API

17 files changed, 61 insertions, 47 deletions

diff --git a/xml/Makefile.am b/xml/Makefile.am
index ebe357e..46be59f 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -20,5 +20,12 @@ endif
 libstudxml_la_SOURCES += __path__(genx_sources)
 nobase_studxmlinclude_HEADERS += __path__(genx_headers)
 
+nobase_studxmlinclude_HEADERS += __path__(xml_headers)
+
+# Make sure make doesn't try to build the no-extension headers
+# thinking that they are executable.
+#
+__foreach_w__(__f,__path__(xml_headers),__f $(top_srcdir)/xml/__f ): ; @:
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -DLIBSTUDXML_DYNAMIC_LIB
 AM_LDFLAGS = -release __value__(interface_version) -no-undefined
diff --git a/xml/content.hxx b/xml/content
index 575ef1d..e37607f 100644
--- a/xml/content.hxx
+++ b/xml/content
@@ -1,9 +1,9 @@
-// file      : xml/content.hxx
+// file      : xml/content -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_CONTENT_HXX
-#define XML_CONTENT_HXX
+#ifndef XML_CONTENT
+#define XML_CONTENT
 
 #include <xml/details/pre.hxx>
 
@@ -32,4 +32,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_CONTENT_HXX
+#endif // XML_CONTENT
diff --git a/xml/exception.hxx b/xml/exception
index c9895bb..1fe1eb2 100644
--- a/xml/exception.hxx
+++ b/xml/exception
@@ -1,9 +1,9 @@
-// file      : xml/exception.hxx
+// file      : xml/exception -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_EXCEPTION_HXX
-#define XML_EXCEPTION_HXX
+#ifndef XML_EXCEPTION
+#define XML_EXCEPTION
 
 #include <xml/details/pre.hxx>
 
@@ -18,4 +18,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_EXCEPTION_HXX
+#endif // XML_EXCEPTION
diff --git a/xml/forward.hxx b/xml/forward
index bacd5f5..8d474c7 100644
--- a/xml/forward.hxx
+++ b/xml/forward
@@ -1,9 +1,9 @@
-// file      : xml/forward.hxx
+// file      : xml/forward -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_FORWARD_HXX
-#define XML_FORWARD_HXX
+#ifndef XML_FORWARD
+#define XML_FORWARD
 
 #include <xml/details/pre.hxx>
 
@@ -16,4 +16,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_FORWARD_HXX
+#endif // XML_FORWARD
diff --git a/xml/makefile b/xml/makefile
index 6c8f3b9..52203aa 100644
--- a/xml/makefile
+++ b/xml/makefile
@@ -5,6 +5,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
 sources := qname.cxx parser.cxx serializer.cxx value-traits.cxx
+xml_headers := content exception forward qname parser serializer value-traits
 
 # Expat.
 #
@@ -72,6 +73,12 @@ $(out_base)/: $(studxml.l)
 
 # Dist.
 #
+
+# Set it for the out_root so that it is visible in examples/tests. See
+# Makefile.am for why we need it there.
+#
+$(our_root)/%.dist: export xml_headers := $(xml_headers) 
+
 $(dist): export sources := $(sources)
 $(dist): export expat_sources := $(expat_sources)
 $(dist): export expat_headers := $(expat_headers)
@@ -89,7 +96,7 @@ $(dist): export interface_version = $(shell sed -e \
 
 $(dist):
 	$(call dist-data,$(sources) $(expat_sources) $(genx_sources))
-	$(call dist-data,$(headers) $(expat_headers) $(genx_headers))
+	$(call dist-data,$(headers) $(xml_headers) $(expat_headers) $(genx_headers))
 	$(call dist-data,$(data_dist) details/config.h.in)
 	$(call meta-vc9proj,libstudxml-vc9.vcproj)
 	$(call meta-vc10proj,libstudxml-vc10.vcxproj)
diff --git a/xml/parser.hxx b/xml/parser
index 6f90522..a1b6250 100644
--- a/xml/parser.hxx
+++ b/xml/parser
@@ -1,9 +1,9 @@
-// file      : xml/parser.hxx
+// file      : xml/parser -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_PARSER_HXX
-#define XML_PARSER_HXX
+#ifndef XML_PARSER
+#define XML_PARSER
 
 #include <xml/details/pre.hxx>
 
@@ -27,10 +27,10 @@
 #  error UTF-16 expat (XML_UNICODE defined) is not supported
 #endif
 
-#include <xml/forward.hxx>
-#include <xml/qname.hxx>
-#include <xml/content.hxx>
-#include <xml/exception.hxx>
+#include <xml/forward>
+#include <xml/qname>
+#include <xml/content>
+#include <xml/exception>
 
 #include <xml/details/export.hxx>
 
@@ -470,4 +470,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_PARSER_HXX
+#endif // XML_PARSER
diff --git a/xml/parser.cxx b/xml/parser.cxx
index 37f9f76..5e117b9 100644
--- a/xml/parser.cxx
+++ b/xml/parser.cxx
@@ -9,7 +9,7 @@
 #include <ostream>
 #include <sstream>
 
-#include <xml/parser.hxx>
+#include <xml/parser>
 
 using namespace std;
 
diff --git a/xml/parser.ixx b/xml/parser.ixx
index e5656d4..b0bffab 100644
--- a/xml/parser.ixx
+++ b/xml/parser.ixx
@@ -4,7 +4,7 @@
 
 #include <cassert>
 
-#include <xml/value-traits.hxx>
+#include <xml/value-traits>
 
 namespace xml
 {
diff --git a/xml/parser.txx b/xml/parser.txx
index 0167522..86d9ed7 100644
--- a/xml/parser.txx
+++ b/xml/parser.txx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/value-traits.hxx>
+#include <xml/value-traits>
 
 namespace xml
 {
diff --git a/xml/qname.hxx b/xml/qname
index 7ffd215..85d6424 100644
--- a/xml/qname.hxx
+++ b/xml/qname
@@ -1,16 +1,16 @@
-// file      : xml/qname.hxx
+// file      : xml/qname -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_QNAME_HXX
-#define XML_QNAME_HXX
+#ifndef XML_QNAME
+#define XML_QNAME
 
 #include <xml/details/pre.hxx>
 
 #include <string>
 #include <iosfwd>
 
-#include <xml/forward.hxx>
+#include <xml/forward>
 
 #include <xml/details/export.hxx>
 
@@ -84,4 +84,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_QNAME_HXX
+#endif // XML_QNAME
diff --git a/xml/qname.cxx b/xml/qname.cxx
index 2261ab8..de24e57 100644
--- a/xml/qname.cxx
+++ b/xml/qname.cxx
@@ -4,7 +4,7 @@
 
 #include <ostream>
 
-#include <xml/qname.hxx>
+#include <xml/qname>
 
 using namespace std;
 
diff --git a/xml/serializer.hxx b/xml/serializer
index 4f57e48..6c55d51 100644
--- a/xml/serializer.hxx
+++ b/xml/serializer
@@ -1,9 +1,9 @@
-// file      : xml/serializer.hxx
+// file      : xml/serializer -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_SERIALIZER_HXX
-#define XML_SERIALIZER_HXX
+#ifndef XML_SERIALIZER
+#define XML_SERIALIZER
 
 #include <xml/details/pre.hxx>
 
@@ -13,9 +13,9 @@
 
 #include <xml/details/genx/genx.h>
 
-#include <xml/forward.hxx>
-#include <xml/qname.hxx>
-#include <xml/exception.hxx>
+#include <xml/forward>
+#include <xml/qname>
+#include <xml/exception>
 
 #include <xml/details/export.hxx>
 
@@ -224,4 +224,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_SERIALIZER_HXX
+#endif // XML_SERIALIZER
diff --git a/xml/serializer.cxx b/xml/serializer.cxx
index a6afcca..4d1da5b 100644
--- a/xml/serializer.cxx
+++ b/xml/serializer.cxx
@@ -5,7 +5,7 @@
 #include <new>     // std::bad_alloc
 #include <cstring> // std::strlen
 
-#include <xml/serializer.hxx>
+#include <xml/serializer>
 
 using namespace std;
 
diff --git a/xml/serializer.ixx b/xml/serializer.ixx
index 81631f2..ea3dcf0 100644
--- a/xml/serializer.ixx
+++ b/xml/serializer.ixx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/value-traits.hxx>
+#include <xml/value-traits>
 
 namespace xml
 {
diff --git a/xml/value-traits.hxx b/xml/value-traits
index ca86382..3bf10e0 100644
--- a/xml/value-traits.hxx
+++ b/xml/value-traits
@@ -1,16 +1,16 @@
-// file      : xml/value-traits.hxx
+// file      : xml/value-traits -*- C++ -*-
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef XML_VALUE_TRAITS_HXX
-#define XML_VALUE_TRAITS_HXX
+#ifndef XML_VALUE_TRAITS
+#define XML_VALUE_TRAITS
 
 #include <xml/details/pre.hxx>
 
 #include <string>
 #include <cstddef> // std::size_t
 
-#include <xml/forward.hxx>
+#include <xml/forward>
 
 #include <xml/details/export.hxx>
 
@@ -50,4 +50,4 @@ namespace xml
 
 #include <xml/details/post.hxx>
 
-#endif // XML_VALUE_TRAITS_HXX
+#endif // XML_VALUE_TRAITS
diff --git a/xml/value-traits.cxx b/xml/value-traits.cxx
index 65aa1b6..3530c91 100644
--- a/xml/value-traits.cxx
+++ b/xml/value-traits.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
-#include <xml/parser.hxx>
+#include <xml/parser>
 
 using namespace std;
 
diff --git a/xml/value-traits.txx b/xml/value-traits.txx
index b76b8a3..3947a99 100644
--- a/xml/value-traits.txx
+++ b/xml/value-traits.txx
@@ -4,8 +4,8 @@
 
 #include <sstream>
 
-#include <xml/parser.hxx>
-#include <xml/serializer.hxx>
+#include <xml/parser>
+#include <xml/serializer>
 
 namespace xml
 {