aboutsummaryrefslogtreecommitdiff
path: root/common/composite/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'common/composite/makefile')
-rw-r--r--common/composite/makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/composite/makefile b/common/composite/makefile
index 1ffb7c4..c7b21dc 100644
--- a/common/composite/makefile
+++ b/common/composite/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)
@@ -37,7 +37,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): $(common.l.cpp-options)
$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
@@ -66,7 +66,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)