aboutsummaryrefslogtreecommitdiff
path: root/common/schema
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-03-27 15:13:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-03-27 15:13:09 +0200
commit2b3b6f26e5125bdc23d07c88c369b5c6ce070a61 (patch)
tree721ba790c135f05ae86e5a2f1449858e14e6b132 /common/schema
parent939cffda799008298fd45344302d5e6c2889061d (diff)
Fix issues preventing building outside source directory
Diffstat (limited to 'common/schema')
-rw-r--r--common/schema/makefile6
1 files changed, 3 insertions, 3 deletions
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)