Fix issues with build outside source directory

11 files changed, 31 insertions, 31 deletions

diff --git a/boost/makefile b/boost/makefile
index a6c3517..9b66f68 100644
--- a/boost/makefile
+++ b/boost/makefile
@@ -50,7 +50,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb_boost.l) $(odb.l) $(boost_date_time.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): $(odb.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(odb_db.l.cpp-options) $(boost.l.cpp-options)
 
@@ -65,7 +65,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --profile boost \
 --generate-query --generate-schema 
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options) $(odb_boost.l.cpp-options) $(boost.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -95,7 +95,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/composite/makefile b/composite/makefile
index 4f12b40..5881af0 100644
--- a/composite/makefile
+++ b/composite/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,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): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/container/makefile b/container/makefile
index ff2eab8..0d9dc80 100644
--- a/container/makefile
+++ b/container/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -51,7 +51,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): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -79,7 +79,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/hello/makefile b/hello/makefile
index c978ff7..a88232e 100644
--- a/hello/makefile
+++ b/hello/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
 --generate-schema
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/inverse/makefile b/inverse/makefile
index e6c5a05..7ac0219 100644
--- a/inverse/makefile
+++ b/inverse/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
 --generate-schema --default-pointer std::tr1::shared_ptr
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/mapping/makefile b/mapping/makefile
index f90e4a7..1a83a39 100644
--- a/mapping/makefile
+++ b/mapping/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,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): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -82,7 +82,7 @@ README database.hxx)
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/query/makefile b/query/makefile
index c4a9627..6c9193b 100644
--- a/query/makefile
+++ b/query/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,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): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/relationship/makefile b/relationship/makefile
index b879201..34d7a91 100644
--- a/relationship/makefile
+++ b/relationship/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
 --generate-schema --default-pointer std::tr1::shared_ptr
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -80,7 +80,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)
diff --git a/schema/custom/makefile b/schema/custom/makefile
index e03c31c..23f3de2 100644
--- a/schema/custom/makefile
+++ b/schema/custom/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -52,7 +52,7 @@ $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
 --default-pointer std::tr1::shared_ptr
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/schema/embedded/makefile b/schema/embedded/makefile
index 639505e..c54d509 100644
--- a/schema/embedded/makefile
+++ b/schema/embedded/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -53,7 +53,7 @@ $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
 --generate-schema --schema-format embedded
 
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/template/makefile b/template/makefile
index 44f393a..4f1542c 100644
--- a/template/makefile
+++ b/template/makefile
@@ -38,7 +38,7 @@ endif
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_db.l) $(odb.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): $(odb.l.cpp-options) $(odb_db.l.cpp-options)
 
 ifeq ($(db_id),mysql)
@@ -51,7 +51,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): $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -79,7 +79,7 @@ $(dist):
 
 # Test.
 #
-$(test): schema := $(src_base)/$(basename $(odb_hdr)).sql
+$(test): schema := $(out_base)/$(basename $(odb_hdr)).sql
 $(test): $(driver)
 	$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(schema))
 	$(call message,test $<,$< --options-file $(dcf_root)/db.options)