diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2009-09-29 08:21:40 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-09-29 08:21:40 +0200 |
| commit | 649df540e853838c51167c8cf02b17fc65fc807d (patch) | |
| tree | 216c12f4ad75138bca1d128c47c911355e2d05a3 /xsde/build | |
| parent | 4f9bd5a46df045f9bd5774125233cf4ac11ae184 (diff) | |
New, makefile-based bundled build implementation
Diffstat (limited to 'xsde/build')
5 files changed, 16 insertions, 7 deletions
diff --git a/xsde/build/c/configuration-dynamic.make b/xsde/build/c/configuration-dynamic.make index c86b863..2003d76 100644 --- a/xsde/build/c/configuration-dynamic.make +++ b/xsde/build/c/configuration-dynamic.make @@ -2,7 +2,7 @@ c_id := gnu c_optimize := n c_debug := n c_rpath := n -c_pp_extra_options := $(CPPFLAGS) -I$(out_root)/../stage/include +c_pp_extra_options := $(CPPFLAGS) c_extra_options := $(CFLAGS) c_ld_extra_options := $(LDFLAGS) c_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') -c_extra_lib_paths := $(out_root)/../stage/lib $(r) +c_extra_lib_paths := $(r) diff --git a/xsde/build/cxx/configuration-dynamic.make b/xsde/build/cxx/configuration-dynamic.make index 7485fe9..568ab40 100644 --- a/xsde/build/cxx/configuration-dynamic.make +++ b/xsde/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/xsde/build/import/libbackend-elements/configuration-dynamic.make b/xsde/build/import/libbackend-elements/configuration-dynamic.make index fd03110..8a6f091 100644 --- a/xsde/build/import/libbackend-elements/configuration-dynamic.make +++ b/xsde/build/import/libbackend-elements/configuration-dynamic.make @@ -1 +1,4 @@ -libbackend_elements_installed := y +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/libcult/configuration-dynamic.make b/xsde/build/import/libcult/configuration-dynamic.make index 78c41d3..73c92bb 100644 --- a/xsde/build/import/libcult/configuration-dynamic.make +++ b/xsde/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) diff --git a/xsde/build/import/libxsd-frontend/configuration-dynamic.make b/xsde/build/import/libxsd-frontend/configuration-dynamic.make index 1b2d3ca..5033ade 100644 --- a/xsde/build/import/libxsd-frontend/configuration-dynamic.make +++ b/xsde/build/import/libxsd-frontend/configuration-dynamic.make @@ -1 +1,4 @@ -libxsd_frontend_installed := y +libxsd_frontend_installed := n +src_root := $(abspath $(src_root)/../libxsd-frontend) +scf_root := $(src_root)/build +out_root := $(src_root) |