[Gtk2hs-commit] gtk2hs ChangeLog,1.254,1.255 Makefile.am,1.23,1.24

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Allow per-module HCFLAGS. Use per-module HCFLAGS to get c2hs to build without
-fglasgow-exts except for the Parsers and C2HSConfig modules.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	13 Dec 2004 20:22:17 -0000	1.23
+++ Makefile.am	13 Dec 2004 21:31:55 -0000	1.24
@@ -134,7 +134,7 @@
 tools_c2hs_c2hsLocal_MAIN = c2hs/toplevel/Main.hs
 tools_c2hs_c2hsLocal_PACKAGEDEPS	= 
 tools_c2hs_c2hsLocal_HEADER		= tools/c2hs/toplevel/c2hs_config.h
-tools_c2hs_c2hsLocal_HCFLAGS		= -fglasgow-exts -fffi
+tools_c2hs_c2hsLocal_HCFLAGS		= 
 
 tools_c2hs_c2hsLocal_SOURCES =			\
 	tools/c2hs/base/admin/BaseVersion.hs	\
@@ -186,6 +186,9 @@
 	tools/c2hs/toplevel/C2HSConfig.hs	\
 	tools/c2hs/toplevel/c2hs_config.c
 
+tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts
+tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi
+
 tools_c2hs_c2hsLocal_HSFILES		= \
 	$(filter %.hs,$(tools_c2hs_c2hsLocal_SOURCES))
 # Fix automake - the subdir-objects option doesn't work here.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- ChangeLog	13 Dec 2004 20:22:16 -0000	1.254
+++ ChangeLog	13 Dec 2004 21:31:55 -0000	1.255
@@ -11,6 +11,11 @@
 	* Makefile.am: modify invocation of TypeGenerator to pass template file
 	and pass --parentname=Hierarchy for all packages other than gtk.
 
+	* mk/common.mk: allow per-module HCFLAGS
+
+	* Makefile.am: c2hs builds without -fglasgow-exts except for the
+	Parsers and C2HSConfig modules.
+
 2004-12-12 Duncan Coutts <du...@co...>
 
 	* gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to