From c27f87feece2a8fb078c3b885fee64058949d016 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov <boris@codesynthesis.com> Date: Tue, 29 Sep 2009 07:40:03 +0200 Subject: New, makefile-based bundled build implementation --- libxsd-frontend/build/cxx/configuration-dynamic.make | 4 ++-- libxsd-frontend/build/import/libcult/configuration-dynamic.make | 5 ++++- .../build/import/libfrontend-elements/configuration-dynamic.make | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'libxsd-frontend/build') diff --git a/libxsd-frontend/build/cxx/configuration-dynamic.make b/libxsd-frontend/build/cxx/configuration-dynamic.make index 7485fe9..568ab40 100644 --- a/libxsd-frontend/build/cxx/configuration-dynamic.make +++ b/libxsd-frontend/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/libxsd-frontend/build/import/libcult/configuration-dynamic.make b/libxsd-frontend/build/import/libcult/configuration-dynamic.make index 78c41d3..73c92bb 100644 --- a/libxsd-frontend/build/import/libcult/configuration-dynamic.make +++ b/libxsd-frontend/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/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make b/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make index 6583182..70d0da6 100644 --- a/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make +++ b/libxsd-frontend/build/import/libfrontend-elements/configuration-dynamic.make @@ -1 +1,4 @@ -libfrontend_elements_installed := y +libfrontend_elements_installed := n +src_root := $(abspath $(src_root)/../libfrontend-elements) +scf_root := $(src_root)/build +out_root := $(src_root) -- cgit v1.1