diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-03-21 16:06:39 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-03-21 16:06:39 +0200 |
| commit | f654efe02445c92661a20feffa9b2a9f40c996f5 (patch) | |
| tree | ed5db6301911ddca829d1c966ea8f426943ca105 /container | |
| parent | c831d72e298e7fa889d94c06b51ac984910d9e7d (diff) | |
Fix issues with build outside source directory
Diffstat (limited to 'container')
| -rw-r--r-- | container/makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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) |