From f654efe02445c92661a20feffa9b2a9f40c996f5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 21 Mar 2011 16:06:39 +0200 Subject: Fix issues with build outside source directory --- schema/custom/makefile | 4 ++-- schema/embedded/makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'schema') 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)) -- cgit v1.1