[Gtk2hs-commit] gtk2hs ChangeLog,1.399,1.400 Makefile.am,1.59,1.60

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
For all the demo Makefiles, add HC variable so that the ghc version can be
overridden, eg by make installcheck.

Makefile.am: add the calc demo to the distribution and have it built with make
isntallcheck. Override HC=$(HC) when making the demos so the right version of
ghc is used.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Makefile.am	23 Mar 2005 19:34:51 -0000	1.59
+++ Makefile.am	25 Mar 2005 19:31:16 -0000	1.60
@@ -950,7 +950,7 @@
 DEMOS += demo/filechooser 
 endif
 if ENABLE_LIBGLADE
-DEMOS += demo/glade
+DEMOS += demo/glade demo/calc
 if HAVE_GTK_VERSION_2_4
 DEMOS += demo/profileviewer
 endif
@@ -964,7 +964,7 @@
 
 # For the install check just make sure all the demo programs compile and link
 DEMO_MAKE_ARGS= $(if $(PKGCONF), HCFLAGS="-package-conf $(DESTDIR)$(PKGCONF)") \
-		$(if $(GHCPKG_USE_AUTOLIBS),, HCNEEDSPACKAGE=yes)
+		$(if $(GHCPKG_USE_AUTOLIBS),, HCNEEDSPACKAGE=yes) HC=$(HC)
 
 installcheck-local:
 	$(foreach DEMO,$(DEMOS),$(strip	\
@@ -990,7 +990,8 @@
 	demo/sourceview/SourceViewTest.hs demo/sourceview/Makefile	\
 		demo/sourceview/haskell.lang				\
 	demo/treeList/ListTest.hs demo/treeList/Makefile		\
-	demo/unicode/Arabic.hs demo/unicode/Makefile
+	demo/unicode/Arabic.hs demo/unicode/Makefile			\
+	demo/calc/CalcModel.hs demo/calc/Calc.hs demo/calc/Makefile
 
 #
 #       installing and registering packages with the Haskell compiler

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- ChangeLog	25 Mar 2005 19:22:38 -0000	1.399
+++ ChangeLog	25 Mar 2005 19:31:16 -0000	1.400
@@ -33,6 +33,18 @@
 	idle priority. This is a knock-on change from fixing the priority
 	constants in gtk/Graphics/UI/Gtk/General/Structs.hsc.
 
+	* demo/buttonbox/Makefile, demo/calc/Makefile,
+	demo/concurrent/Makefile, demo/filechooser/Makefile,
+	demo/gconf/Makefile, demo/glade/Makefile, demo/graphic/Makefile,
+	demo/hello/Makefile, demo/mozembed/Makefile,
+	demo/profileviewer/Makefile, demo/sourceview/Makefile,
+	demo/treeList/Makefile, demo/unicode/Makefile: add HC variable so that
+	the ghc version can be overridden, eg by make installcheck.
+
+	* Makefile.am: add the calc demo to the distribution and have it built
+	with make isntallcheck. Override HC=$(HC) when making the demos so the
+	right version of ghc is used.
+
 2005-03-24 Duncan Coutts <du...@co...>
 
 	* gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs,