From dc5874e5b8cdb2a8c8a5dc77a0bb4bd891079e3f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 16 Jul 2012 09:56:04 +0200
Subject: Fix code generation for circularly-dependant classes in separate
 headers

New tests: common/circular/{single,multiple}.
---
 build/bootstrap.make | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'build/bootstrap.make')

diff --git a/build/bootstrap.make b/build/bootstrap.make
index aba7532..d4e5049 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -47,11 +47,10 @@ endif
 # Database schema creation.
 #
 ifeq ($(filter $(db_id),sqlite),)
-$(out_base)/.test: schema-extra = \
-$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(src_base)/$1)$(literal_newline)$(literal_tab)
+$(out_base)/.test: schema-body = \
+$(call message,sql $$1,$(dcf_root)/db-driver $$1,$1)$(literal_newline)$(literal_tab)
 $(out_base)/.test: schema = \
-$(foreach s,$1,$(call schema-extra,$s))$(call \
-message,sql $$1,$(dcf_root)/db-driver $$1,$(out_base)/test.sql)
+$(foreach s,$(if $1,$1,$(out_base)/test.sql),$(call schema-body,$s))@:
 endif
 
 # Dist setup.
-- 
cgit v1.1