Update with new dependencies, etc

34 files changed, 56 insertions, 179 deletions

diff --git a/README b/README
index 7b75780..2cfbe98 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
-This archive contains pre-configured CodeSynthesis XSD source code 
-with all its dependencies (except Xerces-C++ and Boost). It allows 
+This archive contains pre-configured CodeSynthesis XSD source code
+with all its dependencies (except Xerces-C++ and Boost). It allows
 you to build the XSD compiler in non-interactive mode (that is,
 without answering any configuration questions).
 
-The following GNU tools are required to build XSD. Any fairly recent 
+The following GNU tools are required to build XSD. Any fairly recent
 GNU/Linux distribution should have these already installed:
 
 GNU bash >= 2.00   (bash --version)  http://www.gnu.org/software/bash/
@@ -20,10 +20,12 @@ the CPPFLAGS and LDFLAGS variables, respectively.
 
 The build system supports the following variables:
 
+CC  	  	  (defaults to gcc if not set)
 CXX               (defaults to g++ if not set)
 AR                (defaults to ar if not set)
 RANLIB            (defaults to ranlib if not set)
 CPPFLAGS
+CFLAGS
 CXXFLAGS
 LDFLAGS
 LIBS
@@ -32,7 +34,7 @@ BOOST_LINK_SYSTEM
 
 For example:
 
-$ make CXX=g++-4.2 CXXFLAGS=-O3 -j 4
+$ make CC=gcc-4.8 CXX=g++-4.8 CFLAGS=-O3 CXXFLAGS=-O3 -j 4
 
 The BOOST_LIB_SUFFIX variable allows you to specify the optional
 Boost library suffix. For example, if your Boost library names are
@@ -41,7 +43,7 @@ set BOOST_LIB_SUFFIX to -gcc41-mt-d.
 
 The BOOST_LINK_SYSTEM variable allows you to specify whether the
 Boost system library should be explicitly linked to which may be
-required by newer linkers. The valid values are 'y' (default) and 
+required by newer linkers. The valid values are 'y' (default) and
 'n'.
 
 If you would like to see the full compiler/linker/etc., command lines,
@@ -49,7 +51,7 @@ you can add verbose=1 to the make command line:
 
 $ make verbose=1
 
-After the build is complete, the XSD compiler can be found in the 
+After the build is complete, the XSD compiler can be found in the
 xsd/xsd/ directory and the runtime headers in the xsd/libxsd/ directory.
 You can install the XSD compiler, runtime library, and documentation
 with the install target, for example:
diff --git a/libbackend-elements/build/cxx/gnu/configuration-dynamic.make b/libbackend-elements/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index f3fe64d..0000000
--- a/libbackend-elements/build/cxx/gnu/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-ifneq ($(CXX),)
-cxx_gnu := $(CXX)
-else
-cxx_gnu := g++
-endif
-
-cxx_gnu_libraries := 
-cxx_gnu_optimization_options :=
diff --git a/libbackend-elements/build/import/libboost/configuration-dynamic.make b/libbackend-elements/build/import/libboost/configuration-dynamic.make
deleted file mode 100644
index ab55882..0000000
--- a/libbackend-elements/build/import/libboost/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-libboost_installed := y
-libboost_suffix := $(BOOST_LIB_SUFFIX)
-
-ifeq ($(BOOST_LINK_SYSTEM),n)
-libboost_system := n
-else
-libboost_system := y
-endif
diff --git a/libbackend-elements/build/import/libcult/configuration-dynamic.make b/libbackend-elements/build/import/libcult/configuration-dynamic.make
deleted file mode 100644
index 73c92bb..0000000
--- a/libbackend-elements/build/import/libcult/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libcult_installed := n
-src_root := $(abspath $(src_root)/../libcult)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/libcult/build/configuration-dynamic.make b/libcult/build/configuration-dynamic.make
deleted file mode 100644
index e027b0b..0000000
--- a/libcult/build/configuration-dynamic.make
+++ /dev/null
@@ -1,3 +0,0 @@
-cult_dr := n
-cult_threads := n
-cult_network := n
diff --git a/libcult/build/cxx/configuration-dynamic.make b/libcult/build/cxx/configuration-dynamic.make
deleted file mode 100644
index 568ab40..0000000
--- a/libcult/build/cxx/configuration-dynamic.make
+++ /dev/null
@@ -1,14 +0,0 @@
-cxx_id       := gnu
-cxx_optimize := n
-cxx_debug    := n
-cxx_rpath    := n
-cxx_pp_extra_options := $(CPPFLAGS)
-cxx_extra_options    := $(CXXFLAGS)
-cxx_ld_extra_options := $(LDFLAGS)
-cxx_extra_libs       := $(LIBS)
-
-r := $(shell echo $(LDFLAGS) | sed -e 's/-L *\([^ ]*\)/-L\1/g')
-r := $(patsubst -L%,%,$(filter -L%,$(r)))
-r := $(shell echo $(r) | sed -e 's/ /:/g')
-
-cxx_extra_lib_paths  := $(r)
diff --git a/libcult/build/cxx/gnu/configuration-dynamic.make b/libcult/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index f3fe64d..0000000
--- a/libcult/build/cxx/gnu/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-ifneq ($(CXX),)
-cxx_gnu := $(CXX)
-else
-cxx_gnu := g++
-endif
-
-cxx_gnu_libraries := 
-cxx_gnu_optimization_options :=
diff --git a/libcult/build/ld/configuration-lib-dynamic.make b/libcult/build/ld/configuration-lib-dynamic.make
deleted file mode 100644
index 74c8885..0000000
--- a/libcult/build/ld/configuration-lib-dynamic.make
+++ /dev/null
@@ -1,13 +0,0 @@
-ld_lib_type   := archive
-
-ifneq ($(AR),)
-ld_lib_ar     := $(AR)
-else
-ld_lib_ar     := ar
-endif
-
-ifneq ($(RANLIB),)
-ld_lib_ranlib := $(RANLIB)
-else
-ld_lib_ranlib := ranlib
-endif
diff --git a/libcutl/build/c/configuration-dynamic.make b/libcutl/build/c/configuration-dynamic.make
new file mode 100644
index 0000000..17788dd
--- /dev/null
+++ b/libcutl/build/c/configuration-dynamic.make
@@ -0,0 +1,11 @@
+c_id               := generic
+c_pp_extra_options := $(CPPFLAGS)
+c_extra_options    := $(CFLAGS)
+c_ld_extra_options := $(LDFLAGS)
+c_extra_libs       := $(LIBS)
+
+r := $(shell echo $(LDFLAGS) | sed -e 's/-L *\([^ ]*\)/-L\1/g')
+r := $(patsubst -L%,%,$(filter -L%,$(r)))
+r := $(shell echo $(r) | sed -e 's/ /:/g')
+
+c_extra_lib_paths  := $(r)
diff --git a/libcutl/build/c/generic/configuration-dynamic.make b/libcutl/build/c/generic/configuration-dynamic.make
new file mode 100644
index 0000000..c8cf80a
--- /dev/null
+++ b/libcutl/build/c/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CC),)
+c_generic := $(CC)
+else
+c_generic := gcc
+endif
diff --git a/libbackend-elements/build/cxx/configuration-dynamic.make b/libcutl/build/cxx/configuration-dynamic.make
index 568ab40..83cf860 100644
--- a/libbackend-elements/build/cxx/configuration-dynamic.make
+++ b/libcutl/build/cxx/configuration-dynamic.make
@@ -1,7 +1,4 @@
-cxx_id       := gnu
-cxx_optimize := n
-cxx_debug    := n
-cxx_rpath    := n
+cxx_id               := generic
 cxx_pp_extra_options := $(CPPFLAGS)
 cxx_extra_options    := $(CXXFLAGS)
 cxx_ld_extra_options := $(LDFLAGS)
diff --git a/libcutl/build/cxx/generic/configuration-dynamic.make b/libcutl/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..d1672cf
--- /dev/null
+++ b/libcutl/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CXX),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
diff --git a/libbackend-elements/build/ld/configuration-lib-dynamic.make b/libcutl/build/ld/configuration-lib-dynamic.make
index 74c8885..74c8885 100644
--- a/libbackend-elements/build/ld/configuration-lib-dynamic.make
+++ b/libcutl/build/ld/configuration-lib-dynamic.make
diff --git a/libfrontend-elements/build/cxx/configuration-dynamic.make b/libfrontend-elements/build/cxx/configuration-dynamic.make
deleted file mode 100644
index 568ab40..0000000
--- a/libfrontend-elements/build/cxx/configuration-dynamic.make
+++ /dev/null
@@ -1,14 +0,0 @@
-cxx_id       := gnu
-cxx_optimize := n
-cxx_debug    := n
-cxx_rpath    := n
-cxx_pp_extra_options := $(CPPFLAGS)
-cxx_extra_options    := $(CXXFLAGS)
-cxx_ld_extra_options := $(LDFLAGS)
-cxx_extra_libs       := $(LIBS)
-
-r := $(shell echo $(LDFLAGS) | sed -e 's/-L *\([^ ]*\)/-L\1/g')
-r := $(patsubst -L%,%,$(filter -L%,$(r)))
-r := $(shell echo $(r) | sed -e 's/ /:/g')
-
-cxx_extra_lib_paths  := $(r)
diff --git a/libfrontend-elements/build/cxx/gnu/configuration-dynamic.make b/libfrontend-elements/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index f3fe64d..0000000
--- a/libfrontend-elements/build/cxx/gnu/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-ifneq ($(CXX),)
-cxx_gnu := $(CXX)
-else
-cxx_gnu := g++
-endif
-
-cxx_gnu_libraries := 
-cxx_gnu_optimization_options :=
diff --git a/libfrontend-elements/build/import/libcult/configuration-dynamic.make b/libfrontend-elements/build/import/libcult/configuration-dynamic.make
deleted file mode 100644
index 73c92bb..0000000
--- a/libfrontend-elements/build/import/libcult/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libcult_installed := n
-src_root := $(abspath $(src_root)/../libcult)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/libfrontend-elements/build/ld/configuration-lib-dynamic.make b/libfrontend-elements/build/ld/configuration-lib-dynamic.make
deleted file mode 100644
index 74c8885..0000000
--- a/libfrontend-elements/build/ld/configuration-lib-dynamic.make
+++ /dev/null
@@ -1,13 +0,0 @@
-ld_lib_type   := archive
-
-ifneq ($(AR),)
-ld_lib_ar     := $(AR)
-else
-ld_lib_ar     := ar
-endif
-
-ifneq ($(RANLIB),)
-ld_lib_ranlib := $(RANLIB)
-else
-ld_lib_ranlib := ranlib
-endif
diff --git a/libxsd-frontend/build/cxx/configuration-dynamic.make b/libxsd-frontend/build/cxx/configuration-dynamic.make
index 568ab40..83cf860 100644
--- a/libxsd-frontend/build/cxx/configuration-dynamic.make
+++ b/libxsd-frontend/build/cxx/configuration-dynamic.make
@@ -1,7 +1,4 @@
-cxx_id       := gnu
-cxx_optimize := n
-cxx_debug    := n
-cxx_rpath    := n
+cxx_id               := generic
 cxx_pp_extra_options := $(CPPFLAGS)
 cxx_extra_options    := $(CXXFLAGS)
 cxx_ld_extra_options := $(LDFLAGS)
diff --git a/libxsd-frontend/build/cxx/generic/configuration-dynamic.make b/libxsd-frontend/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..d1672cf
--- /dev/null
+++ b/libxsd-frontend/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CXX),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
diff --git a/libxsd-frontend/build/cxx/gnu/configuration-dynamic.make b/libxsd-frontend/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index f3fe64d..0000000
--- a/libxsd-frontend/build/cxx/gnu/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-ifneq ($(CXX),)
-cxx_gnu := $(CXX)
-else
-cxx_gnu := g++
-endif
-
-cxx_gnu_libraries := 
-cxx_gnu_optimization_options :=
diff --git a/libxsd-frontend/build/import/libboost/configuration-dynamic.make b/libxsd-frontend/build/import/libboost/configuration-dynamic.make
deleted file mode 100644
index ab55882..0000000
--- a/libxsd-frontend/build/import/libboost/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-libboost_installed := y
-libboost_suffix := $(BOOST_LIB_SUFFIX)
-
-ifeq ($(BOOST_LINK_SYSTEM),n)
-libboost_system := n
-else
-libboost_system := y
-endif
diff --git a/libxsd-frontend/build/import/libcult/configuration-dynamic.make b/libxsd-frontend/build/import/libcult/configuration-dynamic.make
deleted file mode 100644
index 73c92bb..0000000
--- a/libxsd-frontend/build/import/libcult/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libcult_installed := n
-src_root := $(abspath $(src_root)/../libcult)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/libxsd-frontend/build/import/libcutl/configuration-dynamic.make b/libxsd-frontend/build/import/libcutl/configuration-dynamic.make
new file mode 100644
index 0000000..f8b049e
--- /dev/null
+++ b/libxsd-frontend/build/import/libcutl/configuration-dynamic.make
@@ -0,0 +1,4 @@
+libcutl_installed := n
+src_root := $(abspath $(src_root)/../libcutl)
+scf_root := $(src_root)/build
+out_root := $(src_root)
diff --git a/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make b/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make
deleted file mode 100644
index 70d0da6..0000000
--- a/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libfrontend_elements_installed := n
-src_root := $(abspath $(src_root)/../libfrontend-elements)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/makefile b/makefile
index ab32f7d..f6493d3 100644
--- a/makefile
+++ b/makefile
@@ -28,26 +28,14 @@ dist-win: $(out_base)/xsd/.dist-win
 
 # Clean.
 #
-clean: $(out_base)/libcult/.clean              \
-       $(out_base)/libfrontend-elements/.clean \
-       $(out_base)/libbackend-elements/.clean  \
+clean: $(out_base)/libcutl/.clean              \
        $(out_base)/libxsd-frontend/.clean      \
        $(out_base)/xsd/.clean
 
-src_root := $(src_base)/libcult
+src_root := $(src_base)/libcutl
 scf_root := $(src_root)/build
 out_root := $(src_root)
-$(call import,$(src_base)/libcult/makefile)
-
-src_root := $(src_base)/libfrontend-elements
-scf_root := $(src_root)/build
-out_root := $(src_root)
-$(call import,$(src_base)/libfrontend-elements/makefile)
-
-src_root := $(src_base)/libbackend-elements
-scf_root := $(src_root)/build
-out_root := $(src_root)
-$(call import,$(src_base)/libbackend-elements/makefile)
+$(call import,$(src_base)/libcutl/makefile)
 
 src_root := $(src_base)/libxsd-frontend
 scf_root := $(src_root)/build
diff --git a/xsd/build/configuration-dynamic.make b/xsd/build/configuration-dynamic.make
index d8f9cf3..6a71079 100644
--- a/xsd/build/configuration-dynamic.make
+++ b/xsd/build/configuration-dynamic.make
@@ -1,7 +1,6 @@
 xsd_with_zlib := n
 xsd_with_ace := n
 xsd_with_xdr := n
-xsd_with_dbxml := n
 xsd_with_xqilla := n
 xsd_with_boost_date_time := n
 xsd_with_boost_serialization := n
diff --git a/xsd/build/cxx/configuration-dynamic.make b/xsd/build/cxx/configuration-dynamic.make
index 568ab40..83cf860 100644
--- a/xsd/build/cxx/configuration-dynamic.make
+++ b/xsd/build/cxx/configuration-dynamic.make
@@ -1,7 +1,4 @@
-cxx_id       := gnu
-cxx_optimize := n
-cxx_debug    := n
-cxx_rpath    := n
+cxx_id               := generic
 cxx_pp_extra_options := $(CPPFLAGS)
 cxx_extra_options    := $(CXXFLAGS)
 cxx_ld_extra_options := $(LDFLAGS)
diff --git a/xsd/build/cxx/generic/configuration-dynamic.make b/xsd/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..d1672cf
--- /dev/null
+++ b/xsd/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CXX),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
diff --git a/xsd/build/cxx/gnu/configuration-dynamic.make b/xsd/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index f3fe64d..0000000
--- a/xsd/build/cxx/gnu/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-ifneq ($(CXX),)
-cxx_gnu := $(CXX)
-else
-cxx_gnu := g++
-endif
-
-cxx_gnu_libraries := 
-cxx_gnu_optimization_options :=
diff --git a/xsd/build/import/cli/configuration-dynamic.make b/xsd/build/import/cli/configuration-dynamic.make
new file mode 100644
index 0000000..908d979
--- /dev/null
+++ b/xsd/build/import/cli/configuration-dynamic.make
@@ -0,0 +1,3 @@
+# We ship up-to-date generated files so cli normally won't be invoked.
+#
+cli_installed := y
diff --git a/xsd/build/import/libbackend-elements/configuration-dynamic.make b/xsd/build/import/libbackend-elements/configuration-dynamic.make
deleted file mode 100644
index 8a6f091..0000000
--- a/xsd/build/import/libbackend-elements/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libbackend_elements_installed := n
-src_root := $(abspath $(src_root)/../libbackend-elements)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/xsd/build/import/libboost/configuration-dynamic.make b/xsd/build/import/libboost/configuration-dynamic.make
deleted file mode 100644
index ab55882..0000000
--- a/xsd/build/import/libboost/configuration-dynamic.make
+++ /dev/null
@@ -1,8 +0,0 @@
-libboost_installed := y
-libboost_suffix := $(BOOST_LIB_SUFFIX)
-
-ifeq ($(BOOST_LINK_SYSTEM),n)
-libboost_system := n
-else
-libboost_system := y
-endif
diff --git a/xsd/build/import/libcult/configuration-dynamic.make b/xsd/build/import/libcult/configuration-dynamic.make
deleted file mode 100644
index 73c92bb..0000000
--- a/xsd/build/import/libcult/configuration-dynamic.make
+++ /dev/null
@@ -1,4 +0,0 @@
-libcult_installed := n
-src_root := $(abspath $(src_root)/../libcult)
-scf_root := $(src_root)/build
-out_root := $(src_root)
diff --git a/xsd/build/import/libcutl/configuration-dynamic.make b/xsd/build/import/libcutl/configuration-dynamic.make
new file mode 100644
index 0000000..f8b049e
--- /dev/null
+++ b/xsd/build/import/libcutl/configuration-dynamic.make
@@ -0,0 +1,4 @@
+libcutl_installed := n
+src_root := $(abspath $(src_root)/../libcutl)
+scf_root := $(src_root)/build
+out_root := $(src_root)