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

---
 mysql/native/makefile     | 2 +-
 mysql/template/makefile   | 6 +++---
 mysql/truncation/makefile | 6 +++---
 mysql/types/makefile      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mysql')

diff --git a/mysql/native/makefile b/mysql/native/makefile
index 035f72f..c58e56f 100644
--- a/mysql/native/makefile
+++ b/mysql/native/makefile
@@ -20,7 +20,7 @@ clean   := $(out_base)/.clean
 # 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)
 
 $(call include-dep,$(cxx_od))
diff --git a/mysql/template/makefile b/mysql/template/makefile
index a492917..5964b0a 100644
--- a/mysql/template/makefile
+++ b/mysql/template/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 mysql --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))
@@ -62,7 +62,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/mysql/truncation/makefile b/mysql/truncation/makefile
index adb015a..9a4f9b1 100644
--- a/mysql/truncation/makefile
+++ b/mysql/truncation/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 mysql --generate-query \
 --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))
@@ -63,7 +63,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/mysql/types/makefile b/mysql/types/makefile
index ed3674f..4114128 100644
--- a/mysql/types/makefile
+++ b/mysql/types/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)
@@ -38,7 +38,7 @@ $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database mysql --generate-schema \
 --generate-query --cxx-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))
@@ -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)
-- 
cgit v1.1