From 5cb088088be8573a01c991421ad882ce899067db Mon Sep 17 00:00:00 2001
From: Ian Lynagh <ian@well-typed.com>
Date: Sat, 5 Jan 2013 18:50:29 +0000
Subject: Make the rule for .hi files depend on the .hs/.lhs files

make thought that it could make a .hi file for the C files in
libraries, which was causing problems when using dynamic-too.
---
 rules/hi-rule.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'rules/hi-rule.mk')

diff --git a/rules/hi-rule.mk b/rules/hi-rule.mk
index 35baffd11a..c1e75022e4 100644
--- a/rules/hi-rule.mk
+++ b/rules/hi-rule.mk
@@ -62,11 +62,13 @@
 # documentation).  An empty command is enough to get GNU make to think
 # it has updated %.hi, but without actually spawning a shell to do so.
 
-define hi-rule # $1 = way
+define hi-rule # $1 = source directory, $2 = object directory, $3 = way
 
-%.$$($1_hisuf) : %.$$($1_osuf) ;
+$2/%.$$($3_hisuf) : $2/%.$$($3_osuf) $1/%.hs ;
+$2/%.$$($3_hisuf) : $2/%.$$($3_osuf) $1/%.lhs ;
 
-%.$$($1_way_)hi-boot : %.$$($1_way_)o-boot ;
+$2/%.$$($3_way_)hi-boot : $2/%.$$($3_way_)o-boot $1/%.hs ;
+$2/%.$$($3_way_)hi-boot : $2/%.$$($3_way_)o-boot $1/%.lhs ;
 
 endef
 
-- 
cgit v1.2.1