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 --- libcutl/build/c/configuration-dynamic.make | 11 +++++++++++ libcutl/build/c/generic/configuration-dynamic.make | 5 +++++ libcutl/build/cxx/configuration-dynamic.make | 11 +++++++++++ libcutl/build/cxx/generic/configuration-dynamic.make | 5 +++++ libcutl/build/ld/configuration-lib-dynamic.make | 13 +++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 libcutl/build/c/configuration-dynamic.make create mode 100644 libcutl/build/c/generic/configuration-dynamic.make create mode 100644 libcutl/build/cxx/configuration-dynamic.make create mode 100644 libcutl/build/cxx/generic/configuration-dynamic.make create mode 100644 libcutl/build/ld/configuration-lib-dynamic.make (limited to 'libcutl') 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/libcutl/build/cxx/configuration-dynamic.make b/libcutl/build/cxx/configuration-dynamic.make new file mode 100644 index 0000000..83cf860 --- /dev/null +++ b/libcutl/build/cxx/configuration-dynamic.make @@ -0,0 +1,11 @@ +cxx_id := generic +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/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/libcutl/build/ld/configuration-lib-dynamic.make b/libcutl/build/ld/configuration-lib-dynamic.make new file mode 100644 index 0000000..74c8885 --- /dev/null +++ b/libcutl/build/ld/configuration-lib-dynamic.make @@ -0,0 +1,13 @@ +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 -- cgit v1.1