[Gtk2hs-commit] gtk2hs ChangeLog,1.393,1.394 Makefile.am,1.58,1.59

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Use template substitution mechanism like the other code generators do.
Replace use of tools/callbackGen/Signal.chs-boot1 and 2 with
tools/callbackGen/Signal.chs.template


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Makefile.am	23 Mar 2005 17:09:15 -0000	1.58
+++ Makefile.am	23 Mar 2005 19:34:51 -0000	1.59
@@ -5,8 +5,7 @@
 DISTCLEANFILES = */*.precomp
 
 EXTRA_DIST = \
-	tools/callbackGen/Signal.chs-boot1	\
-	tools/callbackGen/Signal.chs-boot2	\
+	tools/callbackGen/Signal.chs.template	\
 	tools/callbackGen/gtkmarshal.list	\
 	tools/checkDirs.sh			\
 	tools/c2hs/toplevel/c2hs_config.h	\
@@ -89,8 +88,7 @@
 
 
 gtk/Graphics/UI/Gtk/Signals.chs : \
-	$(srcdir)/tools/callbackGen/Signal.chs-boot1 \
-	$(srcdir)/tools/callbackGen/Signal.chs-boot2 \
+	$(srcdir)/tools/callbackGen/Signal.chs.template \
 	$(srcdir)/tools/callbackGen/gtkmarshal.list \
 	$(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT)
 	$(strip $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) $(MARSHALLDEFS) \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -d -r1.393 -r1.394
--- ChangeLog	23 Mar 2005 17:24:56 -0000	1.393
+++ ChangeLog	23 Mar 2005 19:34:49 -0000	1.394
@@ -23,6 +23,13 @@
 	since ghc-pkg no longer does substitution. Also substitute for
 	${modules} the list of modules in the package.
 
+	* tools/callbackGen/HookGenerator.hs,
+	tools/callbackGen/Signal.chs.template: use template substitution
+	mechanism like the other code generators do.
+
+	* Makefile.am: use tools/callbackGen/Signal.chs.template rather than
+	tools/callbackGen/Signal.chs-boot1 and 2.
+
 2005-03-18 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: temporary fix for building with GHC 6.4. Temporary