From 27142799b33dabc075f660e5de8ab375a1ac9314 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 25 Feb 2014 10:08:02 +0200 Subject: Update and improve for new dependencies --- xsde/build/c/configuration-dynamic.make | 5 +---- xsde/build/c/generic/configuration-dynamic.make | 5 +++++ xsde/build/c/gnu/configuration-dynamic.make | 8 -------- xsde/build/configuration-dynamic.make | 2 ++ xsde/build/cxx/configuration-dynamic.make | 5 +---- xsde/build/cxx/generic/configuration-dynamic.make | 16 ++++++++++++++++ xsde/build/cxx/gnu/configuration-dynamic.make | 8 -------- xsde/build/import/cli/configuration-dynamic.make | 3 +++ .../libbackend-elements/configuration-dynamic.make | 4 ---- xsde/build/import/libboost/configuration-dynamic.make | 8 -------- xsde/build/import/libcult/configuration-dynamic.make | 4 ---- xsde/build/import/libcutl/configuration-dynamic.make | 8 ++++++++ xsde/build/ld/configuration-lib-dynamic.make | 3 --- 13 files changed, 36 insertions(+), 43 deletions(-) create mode 100644 xsde/build/c/generic/configuration-dynamic.make delete mode 100644 xsde/build/c/gnu/configuration-dynamic.make create mode 100644 xsde/build/cxx/generic/configuration-dynamic.make delete mode 100644 xsde/build/cxx/gnu/configuration-dynamic.make create mode 100644 xsde/build/import/cli/configuration-dynamic.make delete mode 100644 xsde/build/import/libbackend-elements/configuration-dynamic.make delete mode 100644 xsde/build/import/libboost/configuration-dynamic.make delete mode 100644 xsde/build/import/libcult/configuration-dynamic.make create mode 100644 xsde/build/import/libcutl/configuration-dynamic.make delete mode 100644 xsde/build/ld/configuration-lib-dynamic.make (limited to 'xsde/build') diff --git a/xsde/build/c/configuration-dynamic.make b/xsde/build/c/configuration-dynamic.make index 2003d76..17788dd 100644 --- a/xsde/build/c/configuration-dynamic.make +++ b/xsde/build/c/configuration-dynamic.make @@ -1,7 +1,4 @@ -c_id := gnu -c_optimize := n -c_debug := n -c_rpath := n +c_id := generic c_pp_extra_options := $(CPPFLAGS) c_extra_options := $(CFLAGS) c_ld_extra_options := $(LDFLAGS) diff --git a/xsde/build/c/generic/configuration-dynamic.make b/xsde/build/c/generic/configuration-dynamic.make new file mode 100644 index 0000000..319a86d --- /dev/null +++ b/xsde/build/c/generic/configuration-dynamic.make @@ -0,0 +1,5 @@ +ifeq ($(filter $(origin CC),undefined default),) +c_generic := $(CC) +else +c_generic := gcc +endif diff --git a/xsde/build/c/gnu/configuration-dynamic.make b/xsde/build/c/gnu/configuration-dynamic.make deleted file mode 100644 index 4062154..0000000 --- a/xsde/build/c/gnu/configuration-dynamic.make +++ /dev/null @@ -1,8 +0,0 @@ -ifneq ($(CC),) -c_gnu := $(CC) -else -c_gnu := gcc -endif - -c_gnu_libraries := -c_gnu_optimization_options := diff --git a/xsde/build/configuration-dynamic.make b/xsde/build/configuration-dynamic.make index 32fa3ca..3b0d328 100644 --- a/xsde/build/configuration-dynamic.make +++ b/xsde/build/configuration-dynamic.make @@ -21,3 +21,5 @@ xsde_parser_imap_buckets := 97 xsde_serializer_smap_buckets := 53 xsde_serializer_smap_bucket_buckets := 53 xsde_serializer_imap_buckets := 97 + +xsde_clean_gen := no \ No newline at end of file diff --git a/xsde/build/cxx/configuration-dynamic.make b/xsde/build/cxx/configuration-dynamic.make index 568ab40..83cf860 100644 --- a/xsde/build/cxx/configuration-dynamic.make +++ b/xsde/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/xsde/build/cxx/generic/configuration-dynamic.make b/xsde/build/cxx/generic/configuration-dynamic.make new file mode 100644 index 0000000..f35ea66 --- /dev/null +++ b/xsde/build/cxx/generic/configuration-dynamic.make @@ -0,0 +1,16 @@ +ifeq ($(filter $(origin CXX),undefined default),) +cxx_generic := $(CXX) +else +cxx_generic := g++ +endif + +r := $(shell $(cxx_generic) $(cxx_extra_options) $(cxx_ld_extra_options) \ +-print-search-dirs 2>&1 | sed -e 's/libraries: =//p' -e d) + +ifneq ($r,) + ifeq ($(cxx_extra_lib_paths),) + cxx_extra_lib_paths := $r + else + cxx_extra_lib_paths := $(cxx_extra_lib_paths):$r + endif +endif diff --git a/xsde/build/cxx/gnu/configuration-dynamic.make b/xsde/build/cxx/gnu/configuration-dynamic.make deleted file mode 100644 index f3fe64d..0000000 --- a/xsde/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/xsde/build/import/cli/configuration-dynamic.make b/xsde/build/import/cli/configuration-dynamic.make new file mode 100644 index 0000000..908d979 --- /dev/null +++ b/xsde/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/xsde/build/import/libbackend-elements/configuration-dynamic.make b/xsde/build/import/libbackend-elements/configuration-dynamic.make deleted file mode 100644 index 8a6f091..0000000 --- a/xsde/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/xsde/build/import/libboost/configuration-dynamic.make b/xsde/build/import/libboost/configuration-dynamic.make deleted file mode 100644 index ab55882..0000000 --- a/xsde/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/xsde/build/import/libcult/configuration-dynamic.make b/xsde/build/import/libcult/configuration-dynamic.make deleted file mode 100644 index 73c92bb..0000000 --- a/xsde/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/xsde/build/import/libcutl/configuration-dynamic.make b/xsde/build/import/libcutl/configuration-dynamic.make new file mode 100644 index 0000000..4e4bb83 --- /dev/null +++ b/xsde/build/import/libcutl/configuration-dynamic.make @@ -0,0 +1,8 @@ +ifeq ($(EXTERNAL_LIBCUTL),y) +libcutl_installed := y +else +libcutl_installed := n +src_root := $(abspath $(src_root)/../libcutl) +scf_root := $(src_root)/build +out_root := $(src_root) +endif diff --git a/xsde/build/ld/configuration-lib-dynamic.make b/xsde/build/ld/configuration-lib-dynamic.make deleted file mode 100644 index c2c560c..0000000 --- a/xsde/build/ld/configuration-lib-dynamic.make +++ /dev/null @@ -1,3 +0,0 @@ -ld_lib_type := archive -ld_lib_ar := ar -ld_lib_ranlib := ranlib -- cgit v1.1