From 3804f7f85a483edc23e0f47217f143e3102abf26 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 16 Nov 2013 09:46:09 +0200
Subject: Update with new dependencies, etc

---
 xsd/build/configuration-dynamic.make                            | 1 -
 xsd/build/cxx/configuration-dynamic.make                        | 5 +----
 xsd/build/cxx/generic/configuration-dynamic.make                | 5 +++++
 xsd/build/cxx/gnu/configuration-dynamic.make                    | 8 --------
 xsd/build/import/cli/configuration-dynamic.make                 | 3 +++
 xsd/build/import/libbackend-elements/configuration-dynamic.make | 4 ----
 xsd/build/import/libboost/configuration-dynamic.make            | 8 --------
 xsd/build/import/libcult/configuration-dynamic.make             | 4 ----
 xsd/build/import/libcutl/configuration-dynamic.make             | 4 ++++
 9 files changed, 13 insertions(+), 29 deletions(-)
 create mode 100644 xsd/build/cxx/generic/configuration-dynamic.make
 delete mode 100644 xsd/build/cxx/gnu/configuration-dynamic.make
 create mode 100644 xsd/build/import/cli/configuration-dynamic.make
 delete mode 100644 xsd/build/import/libbackend-elements/configuration-dynamic.make
 delete mode 100644 xsd/build/import/libboost/configuration-dynamic.make
 delete mode 100644 xsd/build/import/libcult/configuration-dynamic.make
 create mode 100644 xsd/build/import/libcutl/configuration-dynamic.make

(limited to 'xsd/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)
-- 
cgit v1.1