From 2b3b6f26e5125bdc23d07c88c369b5c6ce070a61 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 27 Mar 2011 15:13:09 +0200 Subject: Fix issues preventing building outside source directory --- common/auto/makefile | 6 +++--- common/composite/makefile | 6 +++--- common/const/makefile | 6 +++--- common/container/makefile | 6 +++--- common/ctor/makefile | 6 +++--- common/inverse/makefile | 6 +++--- common/lazy-ptr/makefile | 6 +++--- common/lifecycle/makefile | 6 +++--- common/query/makefile | 6 +++--- common/relationship/makefile | 6 +++--- common/schema/makefile | 6 +++--- common/template/makefile | 6 +++--- common/threads/makefile | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) (limited to 'common') diff --git a/common/auto/makefile b/common/auto/makefile index 64e7d50..7907eb9 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/composite/makefile b/common/composite/makefile index 1ffb7c4..c7b21dc 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/const/makefile b/common/const/makefile index 0314fbe..d5a233e 100644 --- a/common/const/makefile +++ b/common/const/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/container/makefile b/common/container/makefile index 2a95b15..115adb0 100644 --- a/common/container/makefile +++ b/common/container/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/ctor/makefile b/common/ctor/makefile index 9eb8097..9c0c0ee 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/inverse/makefile b/common/inverse/makefile index d0185ad..4e393c8 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index f8c46af..ee599d2 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile index 346a6cd..9dc6dd6 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/query/makefile b/common/query/makefile index 2866b92..5e98970 100644 --- a/common/query/makefile +++ b/common/query/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query --hxx-prologue '\#include "traits.hxx"' -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -67,7 +67,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/relationship/makefile b/common/relationship/makefile index 6b07c17..b60f0b2 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/schema/makefile b/common/schema/makefile index 9e6f616..7c67a8b 100644 --- a/common/schema/makefile +++ b/common/schema/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/template/makefile b/common/template/makefile index 35da3c2..34d7faf 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -36,7 +36,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) diff --git a/common/threads/makefile b/common/threads/makefile index 44c2a06..ddc97b9 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -27,7 +27,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(common.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) $(cxx_obj) $(cxx_od): $(common.l.cpp-options) genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) @@ -37,7 +37,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ --generate-query -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call schema) $(call message,test $<,$< --options-file $(dcf_root)/db.options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) -- cgit v1.1