diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-03-27 15:13:09 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-03-27 15:13:09 +0200 |
| commit | 2b3b6f26e5125bdc23d07c88c369b5c6ce070a61 (patch) | |
| tree | 721ba790c135f05ae86e5a2f1449858e14e6b132 /boost/mysql | |
| parent | 939cffda799008298fd45344302d5e6c2889061d (diff) | |
Fix issues preventing building outside source directory
Diffstat (limited to 'boost/mysql')
| -rw-r--r-- | boost/mysql/date-time/makefile | 6 | ||||
| -rw-r--r-- | boost/mysql/template/makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile index b979f3d..e80cf0b 100644 --- a/boost/mysql/date-time/makefile +++ b/boost/mysql/date-time/makefile @@ -39,7 +39,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(odb_boost.l) $(common.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): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \ $(boost.l.cpp-options) @@ -50,7 +50,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile boost/date-time \ --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \ $(boost.l.cpp-options) @@ -77,7 +77,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/boost/mysql/template/makefile b/boost/mysql/template/makefile index 2ad3a00..1e030fb 100644 --- a/boost/mysql/template/makefile +++ b/boost/mysql/template/makefile @@ -35,7 +35,7 @@ $(call import,\ # Build. # $(driver): $(cxx_obj) $(odb_boost.l) $(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) $(odb_boost.l.cpp-options) \ $(boost.l.cpp-options) @@ -46,7 +46,7 @@ $(gen): $(odb) $(gen): odb := $(odb) $(gen) $(dist): export odb_options += --database mysql --profile boost \ --generate-schema -$(gen): cpp_options := -I$(out_base) +$(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \ $(boost.l.cpp-options) @@ -73,7 +73,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) |