From b7824f749e29f7c9d018e468e18c2c7b6bd3e4c9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 30 Mar 2010 11:40:26 +0200 Subject: Use odb prefix for inclusion --- odb/makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'odb/makefile') diff --git a/odb/makefile b/odb/makefile index 2789a47..7375546 100644 --- a/odb/makefile +++ b/odb/makefile @@ -70,14 +70,18 @@ $(call import,\ $(odb): $(cxx_dobj) $(cutl.l) | $(odb_so) $(odb_so): $(cxx_pobj) $(cutl.l) -$(cxx_dobj) $(cxx_dod): cpp_options := -I$(src_base) +$(cxx_dobj) $(cxx_dod): cpp_options := -I$(src_root) $(cxx_pobj) $(cxx_dobj) $(cxx_pod) $(cxx_dod): $(cutl.l.cpp-options) genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): cli := $(cli) -$(gen): cli_options := --generate-file-scanner --guard-prefix ODB +$(gen): cli_options := \ +--generate-file-scanner \ +--include-with-brackets \ +--include-prefix odb \ +--guard-prefix ODB $(call include-dep,$(cxx_pod)) $(call include-dep,$(cxx_dod)) @@ -127,7 +131,7 @@ ifdef cxx_gnu $(cxx_pobj): cxx_pic_options := -fPIC -$(cxx_pobj) $(cxx_pod): cpp_options := -I$(src_base) \ +$(cxx_pobj) $(cxx_pod): cpp_options := -I$(src_root) \ -I$(shell $(cxx_gnu) -print-file-name=plugin)/include $(odb_so): -- cgit v1.1