From 2b3b6f26e5125bdc23d07c88c369b5c6ce070a61 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 27 Mar 2011 15:13:09 +0200
Subject: Fix issues preventing building outside source directory

---
 common/query/makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/query')

diff --git a/common/query/makefile b/common/query/makefile
index 2866b92..5e98970 100644
--- a/common/query/makefile
+++ b/common/query/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 --hxx-prologue '\#include "traits.hxx"'
-$(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))
@@ -67,7 +67,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)
-- 
cgit v1.1