[Gtk2hs-commit] gtk2hs ChangeLog,1.300,1.301 Makefile.am,1.38,1.39

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Fix libHSgtk_a_SOURCES, we were distributing preprocessed sources for some
files which is wrong of course, we should distribute the original.

Add missing dependency that caused build failure on an older gmake version.

Add some HCFLAGS for a couple sources since older ghc versions do not like
them to be given in the source file in a an {-# OPTIONS #-} pragma.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	16 Jan 2005 14:34:51 -0000	1.38
+++ Makefile.am	16 Jan 2005 21:35:39 -0000	1.39
@@ -183,6 +183,8 @@
 	tools/c2hs/toplevel/C2HSConfig.hs	\
 	tools/c2hs/toplevel/c2hs_config.c
 
+tools_c2hs_base_general_Binary_hs_HCFLAGS = -O -funbox-strict-fields
+tools_c2hs_base_general_FastMutInt_hs_HCFLAGS = -O
 tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts
 tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \
 	'-\#include<tools/c2hs/toplevel/c2hs_config.h>'
@@ -309,7 +311,7 @@
 	gtk/Graphics/UI/Gtk/Abstract/Container.chs			\
 	gtk/Graphics/UI/Gtk/Abstract/Misc.chs				\
 	gtk/Graphics/UI/Gtk/Abstract/Object.chs.pp			\
-	gtk/Graphics/UI/Gtk/Abstract/Paned.chs				\
+	gtk/Graphics/UI/Gtk/Abstract/Paned.chs.pp			\
 	gtk/Graphics/UI/Gtk/Abstract/Range.chs				\
 	gtk/Graphics/UI/Gtk/Abstract/Scale.chs				\
 	gtk/Graphics/UI/Gtk/Abstract/Widget.chs				\
@@ -322,7 +324,7 @@
 	gtk/Graphics/UI/Gtk/Display/Label.chs				\
 	gtk/Graphics/UI/Gtk/Display/ProgressBar.chs			\
 	gtk/Graphics/UI/Gtk/Display/Statusbar.chs			\
-	gtk/Graphics/UI/Gtk/Entry/Editable.chs				\
+	gtk/Graphics/UI/Gtk/Entry/Editable.chs.pp			\
 	gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp				\
 	gtk/Graphics/UI/Gtk/Entry/EntryCompletion.chs.pp		\
 	gtk/Graphics/UI/Gtk/Entry/HScale.chs				\
@@ -383,7 +385,7 @@
 	gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs		\
 	gtk/Graphics/UI/Gtk/Selectors/FontSelection.chs			\
 	gtk/Graphics/UI/Gtk/Selectors/FontSelectionDialog.chs		\
-	gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs			\
+	gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs.pp		\
 	gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs.pp		\
 	gtk/Graphics/UI/Gtk/Selectors/FileChooserDialog.chs.pp		\
 	gtk/Graphics/UI/Gtk/TreeList/CellRendererPixbuf.chs		\
@@ -608,7 +610,7 @@
 
 DISTCLEANFILES+= libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep)
 
-$(libHSglade_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSglade_a_CHSFILES)
+$(libHSglade_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSglade_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSglade_a.deps $(libHSglade_a_CHSFILES:.chs=.dep)
  endif

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- ChangeLog	16 Jan 2005 21:34:06 -0000	1.300
+++ ChangeLog	16 Jan 2005 21:35:39 -0000	1.301
@@ -39,6 +39,19 @@
 	gtk/Graphics/UI/Gtk/Pango/Description.chs: more import tweaks for
 	compatability with older versions of ghc.
 
+	* tools/c2hs/base/general/FastMutInt.hs,
+	tools/c2hs/base/general/Binary.hs: allow these to compile with older
+	ghc versions 5.04.x and 6.0.x, that lack openBinaryFile and
+	Data.HashTable and that do not like you to put optimisation flags in
+	an {-# OPTIONS #-} pragma. Also define SIZEOF_HSINT more portably.
+
+	* Makefile.am: fix libHSgtk_a_SOURCES, we were distributing
+	preprocessed sources for some files which is wrong of course, we
+	should distribute the original. Add missing dependency that caused
+	build failure on an older gmake version. Add some HCFLAGS for a couple
+	sources since older ghc versions do not like them to be given in the
+	source file in a an {-# OPTIONS #-} pragma.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files