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

---
 tracer/include/makefile     | 4 ++--
 tracer/object/makefile      | 4 ++--
 tracer/pragma/makefile      | 4 ++--
 tracer/template/makefile    | 4 ++--
 tracer/transaction/makefile | 2 +-
 tracer/types/makefile       | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tracer')

diff --git a/tracer/include/makefile b/tracer/include/makefile
index f5c9f32..a7f7089 100644
--- a/tracer/include/makefile
+++ b/tracer/include/makefile
@@ -32,8 +32,8 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.l) $(odb.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(out_base)/../.. \
--I$(src_base)/../..
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) \
+-I$(out_base)/../.. -I$(src_base)/../..
 $(cxx_obj) $(cxx_od): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 genf := $(foreach f,$(odb_hdr:.hxx=-odb),$(addprefix $f,.hxx .ixx .cxx))
diff --git a/tracer/object/makefile b/tracer/object/makefile
index 9c4ef1f..bd0efca 100644
--- a/tracer/object/makefile
+++ b/tracer/object/makefile
@@ -32,7 +32,7 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.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_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx)
@@ -41,7 +41,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database tracer
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/tracer/pragma/makefile b/tracer/pragma/makefile
index 5ae74ef..688c6e1 100644
--- a/tracer/pragma/makefile
+++ b/tracer/pragma/makefile
@@ -32,7 +32,7 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.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_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx)
@@ -41,7 +41,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database tracer
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/tracer/template/makefile b/tracer/template/makefile
index ce99eb2..e527f3d 100644
--- a/tracer/template/makefile
+++ b/tracer/template/makefile
@@ -32,7 +32,7 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.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_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx)
@@ -41,7 +41,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database tracer
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/tracer/transaction/makefile b/tracer/transaction/makefile
index 3979cf3..5cc6ef5 100644
--- a/tracer/transaction/makefile
+++ b/tracer/transaction/makefile
@@ -27,7 +27,7 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.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_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od))
diff --git a/tracer/types/makefile b/tracer/types/makefile
index ee24b4d..2a7ceb5 100644
--- a/tracer/types/makefile
+++ b/tracer/types/makefile
@@ -32,7 +32,7 @@ $(call import,\
 # Build.
 #
 $(driver): $(cxx_obj) $(odb_tracer.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_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx)
@@ -41,7 +41,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database tracer
-$(gen): cpp_options := -I$(out_base)
+$(gen): cpp_options := -I$(src_base)
 $(gen): $(odb_tracer.l.cpp-options) $(odb.l.cpp-options)
 
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-- 
cgit v1.1