[Gtk2hs-commit] gtk2hs ChangeLog,1.547.2.11,1.547.2.12 Makefile.am,1.89.2.5,1.89.2.6

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

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

Modified Files:
      Tag: branch-0-9-8
	ChangeLog Makefile.am 
Log Message:
Fix for ghc 6.4 on windows when compiling via C (which is implied by -O),
use -I. so that ghc can find #include"gtk/wingtk.h"
Add the fastdraw demo files to the EXTRA_DIST list and add the list of demos
that are built by the make installtest target.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.89.2.5
retrieving revision 1.89.2.6
diff -u -d -r1.89.2.5 -r1.89.2.6
--- Makefile.am	13 Jun 2005 21:59:04 -0000	1.89.2.5
+++ Makefile.am	14 Jun 2005 00:36:07 -0000	1.89.2.6
@@ -500,7 +500,7 @@
 gtk_Graphics_UI_Gtk_Gdk_Drawable_hs_HCFLAGS	= -fglasgow-exts
 
 if WIN32
-gtk_Graphics_UI_Gtk_General_General_hs_HCFLAGS	= '-\#include"gtk/wingtk.h"'
+gtk_Graphics_UI_Gtk_General_General_hs_HCFLAGS	= '-\#include"gtk/wingtk.h"' -I.
 endif
 
 libHSgtk_a_LIBADD =							\
@@ -1044,7 +1044,7 @@
 ################################################################################
 
 DEMOS = demo/hello demo/buttonbox demo/concurrent \
-	demo/graphic demo/treeList demo/unicode
+	demo/graphic demo/treeList demo/unicode demo/fastdraw
 if HAVE_GTK_VERSION_2_4
 DEMOS += demo/filechooser 
 endif
@@ -1094,7 +1094,8 @@
 	demo/treeList/ListTest.hs demo/treeList/Makefile		\
 	demo/unicode/Arabic.hs demo/unicode/Makefile			\
 	demo/calc/CalcModel.hs demo/calc/Calc.hs demo/calc/Makefile	\
-		demo/calc/calc.glade
+		demo/calc/calc.glade					\
+	demo/fastdraw/FastDraw.hs demo/fastdraw/Makefile
 
 #
 #       installing and registering packages with the Haskell compiler

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.547.2.11
retrieving revision 1.547.2.12
diff -u -d -r1.547.2.11 -r1.547.2.12
--- ChangeLog	14 Jun 2005 00:16:12 -0000	1.547.2.11
+++ ChangeLog	14 Jun 2005 00:36:07 -0000	1.547.2.12
@@ -1,3 +1,10 @@
+2005-06-14 Duncan Coutts <du...@co...>
+
+	* Makefile.am: fix for ghc 6.4 on windows when compiling via C (which
+	is implied by -O), use -I. so that ghc can find #include"gtk/wingtk.h"
+	Add the fastdraw demo files to the EXTRA_DIST list and add the list of
+	demo that are built by the make installtest target.
+
 2005-06-13 Axel Simon <A....@ke...>
 
 	* INSTALL: Update install instructions.