aboutsummaryrefslogtreecommitdiff
path: root/libbackend-elements
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-09-29 08:21:40 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-09-29 08:21:40 +0200
commit649df540e853838c51167c8cf02b17fc65fc807d (patch)
tree216c12f4ad75138bca1d128c47c911355e2d05a3 /libbackend-elements
parent4f9bd5a46df045f9bd5774125233cf4ac11ae184 (diff)
New, makefile-based bundled build implementation
Diffstat (limited to 'libbackend-elements')
-rw-r--r--libbackend-elements/build/cxx/configuration-dynamic.make4
-rw-r--r--libbackend-elements/build/import/libcult/configuration-dynamic.make5
2 files changed, 6 insertions, 3 deletions
diff --git a/libbackend-elements/build/cxx/configuration-dynamic.make b/libbackend-elements/build/cxx/configuration-dynamic.make
index 7485fe9..568ab40 100644
--- a/libbackend-elements/build/cxx/configuration-dynamic.make
+++ b/libbackend-elements/build/cxx/configuration-dynamic.make
@@ -2,7 +2,7 @@ cxx_id := gnu
cxx_optimize := n
cxx_debug := n
cxx_rpath := n
-cxx_pp_extra_options := $(CPPFLAGS) -I$(out_root)/../stage/include
+cxx_pp_extra_options := $(CPPFLAGS)
cxx_extra_options := $(CXXFLAGS)
cxx_ld_extra_options := $(LDFLAGS)
cxx_extra_libs := $(LIBS)
@@ -11,4 +11,4 @@ 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 := $(out_root)/../stage/lib $(r)
+cxx_extra_lib_paths := $(r)
diff --git a/libbackend-elements/build/import/libcult/configuration-dynamic.make b/libbackend-elements/build/import/libcult/configuration-dynamic.make
index 78c41d3..73c92bb 100644
--- a/libbackend-elements/build/import/libcult/configuration-dynamic.make
+++ b/libbackend-elements/build/import/libcult/configuration-dynamic.make
@@ -1 +1,4 @@
-libcult_installed := y
+libcult_installed := n
+src_root := $(abspath $(src_root)/../libcult)
+scf_root := $(src_root)/build
+out_root := $(src_root)