From 9106867c0c70bae196c1b38e9594f0340dcc9698 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 21 Mar 2011 16:55:21 +0200 Subject: Factor out database macro setup --- schema/custom/makefile | 6 +----- schema/embedded/makefile | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'schema') diff --git a/schema/custom/makefile b/schema/custom/makefile index 23f3de2..1e36d55 100644 --- a/schema/custom/makefile +++ b/schema/custom/makefile @@ -38,13 +38,9 @@ endif # Build. # $(driver): $(cxx_obj) $(odb_db.l) $(odb.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -D$(db_macro) $(cxx_obj) $(cxx_od): $(odb.l.cpp-options) $(odb_db.l.cpp-options) -ifeq ($(db_id),mysql) -$(cxx_obj) $(cxx_od): cpp_options += -DDATABASE_MYSQL -endif - genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) gen := $(addprefix $(out_base)/,$(genf)) diff --git a/schema/embedded/makefile b/schema/embedded/makefile index c54d509..46f1e3c 100644 --- a/schema/embedded/makefile +++ b/schema/embedded/makefile @@ -38,13 +38,9 @@ endif # Build. # $(driver): $(cxx_obj) $(odb_db.l) $(odb.l) -$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base) -D$(db_macro) $(cxx_obj) $(cxx_od): $(odb.l.cpp-options) $(odb_db.l.cpp-options) -ifeq ($(db_id),mysql) -$(cxx_obj) $(cxx_od): cpp_options += -DDATABASE_MYSQL -endif - genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) gen := $(addprefix $(out_base)/,$(genf)) -- cgit v1.1