From badf755013a76b4eaf955fb5a3e9a6361e1b52dc Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 22 Mar 2013 11:10:19 +0200 Subject: Fix bug in ODB make rules --- build/import/odb/hxx-cxx.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/import/odb/hxx-cxx.make b/build/import/odb/hxx-cxx.make index 86c98fe..a67d6b7 100644 --- a/build/import/odb/hxx-cxx.make +++ b/build/import/odb/hxx-cxx.make @@ -32,19 +32,19 @@ ifeq ($(out_base),$(src_base)) $(odb_pattern): $(src_base)/%.$(cxx_h_suffix) $(call message,odb $<,$(odb) $(cpp_options) \ -$(call expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ +$(call odb-expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ --output-dir $(dir $@) $<) else $(odb_pattern): $(src_base)/%.$(cxx_h_suffix) | $$(dir $$@). $(call message,odb $<,$(odb) $(cpp_options) \ -$(call expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ +$(call odb-expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ --output-dir $(dir $@) $<) $(odb_pattern): $(out_base)/%.$(cxx_h_suffix) | $$(dir $$@). $(call message,odb $<,$(odb) $(cpp_options) \ -$(call expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ +$(call odb-expand-cpp-options,$^) $(cxx_pp_extra_options) $(odb_options) \ --output-dir $(dir $@) $<) endif -- cgit v1.1