Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10139/mk
Modified Files:
common.mk
Log Message:
More win32 build fixes. It now works ok for me so bump to 0.9.7.1_rc1
mk/common.mk: Add $(EXEEXT) when trying to build c2hsLocal
set HSTOOLFLAGS = -H350m -M400m for the release so more people can build ok.
On windows we require more meory for some reason so set
HSTOOLFLAGS = -H400m -M650m
configure.ac: Add $(EXEEXT) to C2HS name.
Do define WIN32 afterall since ghc does not define it (though gcc does).
Bumb the version to 0.9.7.1_rc1
Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- common.mk 23 Jan 2005 15:44:31 -0000 1.54
+++ common.mk 7 Feb 2005 15:39:49 -0000 1.55
@@ -27,7 +27,7 @@
LINK = $(strip $(HC) -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
$(addprefix -package ,$($(PKG)_PACKAGEDEPS)) \
- $(AM_LDFLAGS) $($(PKG)_LDFLAGS))
+ $(AM_LDFLAGS) $(LDFLAGS) $($(PKG)_LDFLAGS))
#Using pattern rule here to prevent automake from understanding the rule
#and falsely concluding that two source files will produce the same object
@@ -87,7 +87,13 @@
# Same for .chi
.PRECIOUS: %.chi
+if WIN32
+#It seems to take considerably more memory on win32. Not sure why.
HSTOOLFLAGS = -H400m -M650m
+else
+#change this to -H350m -M400m for a release so more people can build ok
+HSTOOLFLAGS = -H350m -M400m
+endif
.PHONY: debug
debug :
@@ -124,7 +130,7 @@
$(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \
if test -x $(C2HS); then :; else \
$(MAKE) $(AM_MAKEFLAGS) \
- tools/c2hs/c2hsLocal; fi;))
+ tools/c2hs/c2hsLocal$(EXEEXT); fi;))
$(strip if test -f $($(PKG)_PRECOMP); then :; else \
$(MAKE) $(AM_MAKEFLAGS) $($(PKG)_PRECOMP); fi;)
$(strip $(C2HS) $(C2HS_FLAGS) \
|
