Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7878/mk
Modified Files:
common.mk
Log Message:
Make the build run through.
Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- common.mk 21 Nov 2004 15:06:16 -0000 1.34
+++ common.mk 21 Nov 2004 20:54:59 -0000 1.35
@@ -43,11 +43,6 @@
.o.hi:
@:
-# The cheeky rule for .hi files says that .hi files can be created as
-# side-effect of generating a .o file. Make sure the .hi files are not
-# deleted as normal intermediate files are.
-.PRECIOUS: %.hi
-
HSTOOLFLAGS = -H500m
.PHONY: debug
@@ -79,10 +74,11 @@
--include $(CONFIG_H) \
--cc=$(HC) --lflag=-no-hs-main $<)
-.chs.hs:
- $(strip if test -x $(C2HS); then :; else \
+.chs.hs:
+ $(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \
+ if test -x $(C2HS); then :; else \
$(MAKE) $(AM_MAKEFLAGS) NAME="tools_c2hs_c2hsLocal" \
- tools/c2hs/c2hsLocal; fi;)
+ tools/c2hs/c2hsLocal; fi;))
$(strip if test -f $($(NAME)_PRECOMP); then :; else \
$(MAKE) $(AM_MAKEFLAGS) NAME="$(NAME)" $($(NAME)_PRECOMP); fi;)
$(strip $(C2HS) $(C2HS_FLAGS) \
|
