From 9106867c0c70bae196c1b38e9594f0340dcc9698 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 21 Mar 2011 16:55:21 +0200
Subject: Factor out database macro setup

---
 composite/makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'composite')

diff --git a/composite/makefile b/composite/makefile
index 5881af0..185f1f9 100644
--- a/composite/makefile
+++ b/composite/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) $(odb_hdr:.hxx=.sql)
 gen  := $(addprefix $(out_base)/,$(genf))
 
-- 
cgit v1.1