From 3804f7f85a483edc23e0f47217f143e3102abf26 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 16 Nov 2013 09:46:09 +0200 Subject: Update with new dependencies, etc --- libxsd-frontend/build/cxx/configuration-dynamic.make | 5 +---- libxsd-frontend/build/cxx/generic/configuration-dynamic.make | 5 +++++ libxsd-frontend/build/cxx/gnu/configuration-dynamic.make | 8 -------- libxsd-frontend/build/import/libboost/configuration-dynamic.make | 8 -------- libxsd-frontend/build/import/libcult/configuration-dynamic.make | 4 ---- libxsd-frontend/build/import/libcutl/configuration-dynamic.make | 4 ++++ .../build/import/libfrontend-elements/configuration-dynamic.make | 4 ---- 7 files changed, 10 insertions(+), 28 deletions(-) create mode 100644 libxsd-frontend/build/cxx/generic/configuration-dynamic.make delete mode 100644 libxsd-frontend/build/cxx/gnu/configuration-dynamic.make delete mode 100644 libxsd-frontend/build/import/libboost/configuration-dynamic.make delete mode 100644 libxsd-frontend/build/import/libcult/configuration-dynamic.make create mode 100644 libxsd-frontend/build/import/libcutl/configuration-dynamic.make delete mode 100644 libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make (limited to 'libxsd-frontend/build') 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) -- cgit v1.1