gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs ChangeLog,1.303,1.304

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

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

Modified Files:
	ChangeLog 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- ChangeLog	16 Jan 2005 21:41:56 -0000	1.303
+++ ChangeLog	16 Jan 2005 21:44:14 -0000	1.304
@@ -59,6 +59,11 @@
 	GHCPKG_USE_AUTOLIBS to have the appropriate value to substitute into
 	all the <module>.pkg.in files.
 
+	* gconf/gconf.pkg.in, glib/glib.pkg.in, mogul/mogul.pkg.in,
+	sourceview/sourceview.pkg.in, glade/glade.pkg.in,  gtk/gtk.pkg.in,
+	mozembed/mozembed.pkg.in: use the new GHCPKG_USE_AUTOLIBS substitution
+	so the .pkg files will be understood by older versions of ghc-pkg.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/mogul mogul.pkg.in,1.4,1.5

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

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

Modified Files:
	mogul.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: mogul.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/mogul.pkg.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mogul.pkg.in	14 Jan 2005 13:11:19 -0000	1.4
+++ mogul.pkg.in	16 Jan 2005 21:44:15 -0000	1.5
@@ -1,6 +1,6 @@
 Package {
      name            = "mogul",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/mogul"],
      source_dirs     = [],
      library_dirs    = [@GTK_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/mozembed mozembed.pkg.in,1.2,1.3

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

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

Modified Files:
	mozembed.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: mozembed.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mozembed/mozembed.pkg.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mozembed.pkg.in	12 Jan 2005 00:00:51 -0000	1.2
+++ mozembed.pkg.in	16 Jan 2005 21:44:16 -0000	1.3
@@ -1,6 +1,6 @@
 Package {
      name            = "mozembed",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/mozembed"],
      source_dirs     = [],
      library_dirs    = [@MOZEMBED_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/glade glade.pkg.in,1.3,1.4

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

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

Modified Files:
	glade.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: glade.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glade/glade.pkg.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glade.pkg.in	12 Jan 2005 00:00:49 -0000	1.3
+++ glade.pkg.in	16 Jan 2005 21:44:16 -0000	1.4
@@ -1,6 +1,6 @@
 Package {
      name            = "glade",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/glade"],
      source_dirs     = [],
      library_dirs    = [@LIBGLADE_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/gtk gtk.pkg.in,1.3,1.4

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

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

Modified Files:
	gtk.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: gtk.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gtk.pkg.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk.pkg.in	12 Jan 2005 00:00:50 -0000	1.3
+++ gtk.pkg.in	16 Jan 2005 21:44:16 -0000	1.4
@@ -1,6 +1,6 @@
 Package {
      name            = "gtk",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/gtk"],
      source_dirs     = [],
      library_dirs    = [@GTK_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/sourceview sourceview.pkg.in,1.4,1.5

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

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

Modified Files:
	sourceview.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: sourceview.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.pkg.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sourceview.pkg.in	12 Jan 2005 00:00:48 -0000	1.4
+++ sourceview.pkg.in	16 Jan 2005 21:44:16 -0000	1.5
@@ -1,6 +1,6 @@
 Package {
      name            = "sourceview",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/sourceview"],
      source_dirs     = [],
      library_dirs    = [@SOURCEVIEW_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/glib glib.pkg.in,1.2,1.3

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

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

Modified Files:
	glib.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: glib.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/glib.pkg.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glib.pkg.in	12 Jan 2005 00:00:47 -0000	1.2
+++ glib.pkg.in	16 Jan 2005 21:44:15 -0000	1.3
@@ -1,6 +1,6 @@
 Package {
      name            = "glib",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/glib"],
      source_dirs     = [],
      library_dirs    = [@GLIB_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs/gconf gconf.pkg.in,1.3,1.4

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

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

Modified Files:
	gconf.pkg.in 
Log Message:
use the new GHCPKG_USE_AUTOLIBS substitution so the .pkg files will be
understood by older versions of ghc-pkg.


Index: gconf.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/gconf.pkg.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gconf.pkg.in	12 Jan 2005 00:00:48 -0000	1.3
+++ gconf.pkg.in	16 Jan 2005 21:44:15 -0000	1.4
@@ -1,6 +1,6 @@
 Package {
      name            = "gconf",
-     auto            = True,
+     @GHCPKG_USE_AUTOLIBS@
      import_dirs     = ["@hidir@/gconf"],
      source_dirs     = [],
      library_dirs    = [@GCONF_LIBDIR_CQ@],

[Gtk2hs-commit] gtk2hs ChangeLog,1.302,1.303 configure.ac,1.19,1.20

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

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Do a portability test for sizeof(void *) needed by c2hs's binary serialisation
code.

Do a versionitis test, the "auto libs" feature was only added in ghc 6, so
conditionally define GHCPKG_USE_AUTOLIBS to have the appropriate value to
substitute into all the <module>.pkg.in files.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure.ac	16 Jan 2005 14:36:37 -0000	1.19
+++ configure.ac	16 Jan 2005 21:41:56 -0000	1.20
@@ -60,6 +60,10 @@
 AC_PATH_PROG(TOUCH,touch)
 AC_PROG_RANLIB
 
+dnl The binary serialisation in c2hs depends on the machine word size
+dnl FIXME: this should probably be taken from ghc's config.h
+AC_CHECK_SIZEOF(void *, 4)
+
 dnl On some systems (Solaris,...) asking sh for the current directory
 dnl (with a built-in pwd) and asking make for the current directory
 dnl gives different results. Thus, if possible, we use the same external
@@ -181,6 +185,15 @@
 ])
 AC_MSG_RESULT([$FOUR_WORD_CALLBACK])
 
+dnl From ghc 6 onwards, ghc-pkg has the "auto libs" feature which means
+dnl users do not have to specify the -package flag most of the time.
+dnl All our packages support this mode now.
+dnl Earlieir version of ghc-pkg choke on this package configuration option,
+dnl hence this test which only enables it for ghc 6 onwards.
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.0.0, [
+GHCPKG_USE_AUTOLIBS="auto            = True,"
+])
+
 dnl ghc-pkg 5 searches for libxxx.a, even on Windows. Hence, we need to
 dnl create libraries with these names instead of the windows names.
 GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -lt, 6.0.0, [
@@ -568,6 +581,7 @@
 AC_SUBST(EXTRA_HFILES)
 dnl Versionitis
 AC_SUBST(CREATE_TYPES)
+AC_SUBST(GHCPKG_USE_AUTOLIBS)
 dnl Optional packages
 AC_SUBST(SOURCEVIEW_CFLAGS)
 AC_SUBST(SOURCEVIEW_LIBS)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- ChangeLog	16 Jan 2005 21:40:33 -0000	1.302
+++ ChangeLog	16 Jan 2005 21:41:56 -0000	1.303
@@ -53,6 +53,12 @@
 	sources since older ghc versions do not like them to be given in the
 	source file in a an {-# OPTIONS #-} pragma.
 
+	* configure.ac: do a portability test for sizeof(void *) needed by
+	c2hs's binary serialisation code. Do a versionitis test, the "auto
+	libs" feature was only added in ghc 6, so conditionally define
+	GHCPKG_USE_AUTOLIBS to have the appropriate value to substitute into
+	all the <module>.pkg.in files.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/glib/System/Glib UTFString.hs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/glib/System/Glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1807/glib/System/Glib

Modified Files:
	UTFString.hs 
Log Message:
More import tweaks for compatability with older versions of ghc.


Index: UTFString.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/UTFString.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UTFString.hs	8 Jan 2005 17:45:41 -0000	1.1
+++ UTFString.hs	16 Jan 2005 21:40:33 -0000	1.2
@@ -37,9 +37,8 @@
 
 import Monad	(liftM)
 import Char
-import Foreign (unsafePerformIO)
-
 import Data.Bits
+
 import System.Glib.FFI
 
 -- Define withUTFString to emit UTF-8.

[Gtk2hs-commit] gtk2hs ChangeLog,1.301,1.302

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

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

Modified Files:
	ChangeLog 
Log Message:
More import tweaks for compatability with older versions of ghc.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- ChangeLog	16 Jan 2005 21:35:39 -0000	1.301
+++ ChangeLog	16 Jan 2005 21:40:33 -0000	1.302
@@ -26,7 +26,8 @@
 
 	* mk/chsDepend.in: be less chatty.
 
-	* glib/System/Glib/FFI.hs, glib/System/Glib/GType.chs: in older ghc
+	* glib/System/Glib/FFI.hs, glib/System/Glib/GType.chs,
+	glib/System/Glib/UTFString.hs: in older ghc
 	versions Foreign does not export unsafePerformIO, so import it from
 	System.IO.Unsafe instead. Also conditionally export unsafePerformIO
 	since older ghc versions do not export it from module Foreign.

[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

[Gtk2hs-commit] gtk2hs ChangeLog,1.299,1.300

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

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

Modified Files:
	ChangeLog 
Log Message:
Allow these modules 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.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- ChangeLog	16 Jan 2005 21:29:40 -0000	1.299
+++ ChangeLog	16 Jan 2005 21:34:06 -0000	1.300
@@ -31,6 +31,14 @@
 	System.IO.Unsafe instead. Also conditionally export unsafePerformIO
 	since older ghc versions do not export it from module Foreign.
 
+	* tools/c2hs/gen/CInfo.hs, tools/c2hs/toplevel/C2HSConfig.hs.in:
+	import Foreign.C rather than CForeign, since the latter is not
+	available in older versions of ghc.
+
+	* mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,
+	gtk/Graphics/UI/Gtk/Pango/Description.chs: more import tweaks for
+	compatability with older versions of ghc.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/tools/c2hs/base/general FastMutInt.hs,1.1,1.2 Binary.hs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv572/tools/c2hs/base/general

Modified Files:
	FastMutInt.hs Binary.hs 
Log Message:
Allow these modules 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.


Index: Binary.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/general/Binary.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Binary.hs	13 Nov 2004 17:26:50 -0000	1.1
+++ Binary.hs	16 Jan 2005 21:34:06 -0000	1.2
@@ -1,4 +1,4 @@
-{-# OPTIONS -cpp -fglasgow-exts -O -funbox-strict-fields #-}
+{-# OPTIONS -cpp -fglasgow-exts #-}
 --
 -- (c) The University of Glasgow 2002
 --
@@ -48,10 +48,14 @@
 
   ) where
 
+#include "config.h"
+
 import FastMutInt
 
 import Data.FiniteMap
+# if __GLASGOW_HASKELL__>=602
 import Data.HashTable as HashTable
+# endif
 import Data.Array.IO
 import Data.Array
 import Data.Bits
@@ -60,7 +64,7 @@
 import Data.IORef
 import Data.Char		( ord, chr )
 import Data.Array.Base  	( unsafeRead, unsafeWrite )
-import Control.Monad		( when )
+import Control.Monad		( when, liftM )
 import Control.Exception	( throwDyn )
 import System.IO as IO
 import System.IO.Unsafe		( unsafeInterleaveIO )
@@ -69,13 +73,15 @@
 import GHC.Exts
 import GHC.IOBase	 	( IO(..) )
 import GHC.Word			( Word8(..) )
-import System.IO		( openBinaryFile )
-
+# if __GLASGOW_HASKELL__<602
+import GHC.Handle		( hSetBinaryMode )
+# endif
 -- for debug
 import System.CPUTime           (getCPUTime)
 import Numeric                  (showFFloat)
 
-#define SIZEOF_HSINT 4
+-- FIXME: we should really get SIZEOF_HSINT directly from ghc's config.h
+#define SIZEOF_HSINT SIZEOF_VOID_P
 
 type BinArray = IOUArray Int Word8
 
@@ -185,7 +191,8 @@
 writeBinMem :: BinHandle -> FilePath -> IO ()
 writeBinMem (BinIO _ _ _) _ = error "Data.Binary.writeBinMem: not a memory handle"
 writeBinMem (BinMem _ ix_r sz_r arr_r) fn = do
-  h <- openBinaryFile fn WriteMode
+  h <- openFile fn WriteMode
+  hSetBinaryMode h True
   arr <- readIORef arr_r
   ix  <- readFastMutInt ix_r
   hPutArray h arr ix
@@ -194,7 +201,8 @@
 readBinMem :: FilePath -> IO BinHandle
 -- Return a BinHandle with a totally undefined State
 readBinMem filename = do
-  h <- openBinaryFile filename ReadMode
+  h <- openFile filename ReadMode
+  hSetBinaryMode h True
   filesize' <- hFileSize h
   let filesize = fromIntegral filesize'
   arr <- newArray_ (0,filesize-1)
@@ -619,7 +627,11 @@
 
 	-- Get the final-state
   j <- readIORef  (ud_next usr_state)
+#if __GLASGOW_HASKELL__>=602
   fm <- HashTable.toList (ud_map  usr_state)
+#else
+  fm <- liftM fmToList $ readIORef (ud_map  usr_state)
+#endif
   dict_p <- tellBin bh	-- This is where the dictionary will start
 
 	-- Write the dictionary pointer at the fornt of the file
@@ -643,7 +655,11 @@
 
 		-- The next two fields are only used when writing
 	      ud_next :: IORef Int,	-- The next index to use
+#if __GLASGOW_HASKELL__>=602
 	      ud_map  :: HashTable String Int -- The index of each string
+#else
+	      ud_map  :: IORef (FiniteMap String Int)
+#endif
 	}
 
 noUserData = error "Binary.UserData: no user data"
@@ -656,7 +672,11 @@
 newWriteState :: IO UserData
 newWriteState = do
   j_r <- newIORef 0
+#if __GLASGOW_HASKELL__>=602
   out_r <- HashTable.new (==) HashTable.hashString
+#else
+  out_r <- newIORef emptyFM
+#endif
   return (UserData { ud_dict = error "dict",
 		     ud_next = j_r,
 		     ud_map  = out_r })
@@ -693,14 +713,23 @@
 putSharedString bh str =
   case getUserData bh of
     UserData { ud_next = j_r, ud_map = out_r, ud_dict = dict} -> do
+#if __GLASGOW_HASKELL__>=602
       entry <- HashTable.lookup out_r str
+#else
+      fm <- readIORef out_r
+      let entry = lookupFM fm str
+#endif
       case entry of
 	Just j  -> put_ bh j
 	Nothing -> do
 		     j <- readIORef j_r
 		     put_ bh j
 		     writeIORef j_r (j+1)
+#if __GLASGOW_HASKELL__>=602
 		     HashTable.insert out_r str j
+#else
+		     modifyIORef out_r (\fm -> addToFM fm str j)
+#endif
 
 getSharedString :: BinHandle -> IO String
 getSharedString bh = do

Index: FastMutInt.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/general/FastMutInt.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FastMutInt.hs	13 Nov 2004 17:26:50 -0000	1.1
+++ FastMutInt.hs	16 Jan 2005 21:34:06 -0000	1.2
@@ -1,4 +1,4 @@
-{-# OPTIONS -cpp -fglasgow-exts -O #-}
+{-# OPTIONS -cpp -fglasgow-exts #-}
 --
 -- (c) The University of Glasgow 2002
 --

[Gtk2hs-commit] gtk2hs/mogul/Graphics/UI/Gtk/Mogul WidgetTable.hs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv340/mogul/Graphics/UI/Gtk/Mogul

Modified Files:
	WidgetTable.hs 
Log Message:
More import tweaks for compatability with older versions of ghc.


Index: WidgetTable.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WidgetTable.hs	8 Jan 2005 16:41:58 -0000	1.1
+++ WidgetTable.hs	16 Jan 2005 21:32:32 -0000	1.2
@@ -34,13 +34,12 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import Foreign.ForeignPtr	(unsafeForeignPtrToPtr)
 import Control.Concurrent.MVar	(MVar, newMVar, takeMVar, putMVar, readMVar)
 import System.IO.Unsafe		(unsafePerformIO)
 import Data.FiniteMap		(FiniteMap, emptyFM, addToFM, delFromFM,
 				lookupFM, elemFM)
 
+import System.Glib.FFI
 import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)
 import Graphics.UI.Gtk.Types
 import Graphics.UI.Gtk.Abstract.Widget	(widgetSetName, onUnrealize)
@@ -83,7 +82,7 @@
   let wId = (mkWidgetId name)
   table <- takeMVar widgetTable
   putMVar widgetTable (addToFM table wId
-    ((unsafeForeignPtrToPtr.unWidget.toWidget) w))
+    ((foreignPtrToPtr.unWidget.toWidget) w))
   w `onUnrealize` (do
     table <- takeMVar widgetTable
     putMVar widgetTable (table `delFromFM` wId))

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Pango Description.chs,1.2,1.3

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

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv340/gtk/Graphics/UI/Gtk/Pango

Modified Files:
	Description.chs 
Log Message:
More import tweaks for compatability with older versions of ghc.


Index: Description.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango/Description.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Description.chs	12 Jan 2005 01:34:55 -0000	1.2
+++ Description.chs	16 Jan 2005 21:32:33 -0000	1.3
@@ -53,6 +53,7 @@
 
 import Monad    (liftM)
 import Data.Ratio
+import Data.Bits ((.&.))
 
 import System.Glib.FFI
 import System.Glib.UTFString

[Gtk2hs-commit] gtk2hs/tools/c2hs/gen CInfo.hs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/gen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32567/tools/c2hs/gen

Modified Files:
	CInfo.hs 
Log Message:
Import Foreign.C rather than CForeign, since the latter is not available in
older versions of ghc.


Index: CInfo.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/gen/CInfo.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CInfo.hs	21 Nov 2004 21:05:41 -0000	1.1
+++ CInfo.hs	16 Jan 2005 21:31:21 -0000	1.2
@@ -59,7 +59,7 @@
   bitfieldDirection, bitfieldPadding, bitfieldIntSigned, bitfieldAlignment
 ) where 
 
-import CForeign
+import Foreign.C
 
 -- we can't rely on the compiler used to compile c2hs already having the new
 -- FFI, so this is system dependent

[Gtk2hs-commit] gtk2hs/tools/c2hs/toplevel C2HSConfig.hs.in,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32567/tools/c2hs/toplevel

Modified Files:
	C2HSConfig.hs.in 
Log Message:
Import Foreign.C rather than CForeign, since the latter is not available in
older versions of ghc.


Index: C2HSConfig.hs.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel/C2HSConfig.hs.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- C2HSConfig.hs.in	21 Nov 2004 21:05:42 -0000	1.1
+++ C2HSConfig.hs.in	16 Jan 2005 21:31:22 -0000	1.2
@@ -49,7 +49,7 @@
 import 
  Foreign (Ptr, FunPtr)  -- on an extra line to trick the stupid `mkdependHS'
 import Foreign  (Storable(sizeOf, alignment), toBool)
-import CForeign (CInt)
+import Foreign.C (CInt)
 
 -- program settings
 -- ----------------

[Gtk2hs-commit] gtk2hs/glib/System/Glib FFI.hs,1.1,1.2 GType.chs,1.1,1.2

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

Update of /cvsroot/gtk2hs/gtk2hs/glib/System/Glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32046/glib/System/Glib

Modified Files:
	FFI.hs GType.chs 
Log Message:
In older ghc versions Foreign does not export unsafePerformIO, so import it
from System.IO.Unsafe instead.
Also conditionally export unsafePerformIO since older ghc versions do not
export it from module Foreign.


Index: GType.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/GType.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GType.chs	8 Jan 2005 17:46:16 -0000	1.1
+++ GType.chs	16 Jan 2005 21:29:41 -0000	1.2
@@ -29,10 +29,7 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import Foreign.C
-
-import Foreign (unsafePerformIO)
+import System.Glib.FFI
 
 {# context lib="glib" prefix="g" #}
 

Index: FFI.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/FFI.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FFI.hs	8 Jan 2005 17:45:06 -0000	1.1
+++ FFI.hs	16 Jan 2005 21:29:41 -0000	1.2
@@ -31,11 +31,16 @@
   foreignFree,
   newForeignPtr,
   foreignPtrToPtr,
+# if __GLASGOW_HASKELL__<600
+  -- ghc 6 exports unsafePerformIO from module Foreign
+  -- provide it here for ghc 5
+  unsafePerformIO,
+# endif
   module Foreign,
   module Foreign.C
   ) where
 
-import Foreign (unsafePerformIO)
+import System.IO.Unsafe (unsafePerformIO)
 
 import Foreign.C
 import qualified Foreign

[Gtk2hs-commit] gtk2hs ChangeLog,1.298,1.299

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

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

Modified Files:
	ChangeLog 
Log Message:
In older ghc versions Foreign does not export unsafePerformIO, so import it
from System.IO.Unsafe instead.
Also conditionally export unsafePerformIO since older ghc versions do not
export it from module Foreign.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- ChangeLog	16 Jan 2005 21:25:40 -0000	1.298
+++ ChangeLog	16 Jan 2005 21:29:40 -0000	1.299
@@ -26,6 +26,11 @@
 
 	* mk/chsDepend.in: be less chatty.
 
+	* glib/System/Glib/FFI.hs, glib/System/Glib/GType.chs: in older ghc
+	versions Foreign does not export unsafePerformIO, so import it from
+	System.IO.Unsafe instead. Also conditionally export unsafePerformIO
+	since older ghc versions do not export it from module Foreign.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs ChangeLog,1.297,1.298

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

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

Modified Files:
	ChangeLog 
Log Message:
Do the ghc-pkg registering in a way that works for older ghc versions too.
Make the build a little less chatty.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- ChangeLog	16 Jan 2005 14:36:37 -0000	1.297
+++ ChangeLog	16 Jan 2005 21:25:40 -0000	1.298
@@ -21,6 +21,11 @@
 
 	* configure.ac: bump version to 0.9.7_rc1
 
+	* mk/common.mk: do the ghc-pkg registering in a way that works for
+	older ghc versions too. Make the build a little less chatty.
+
+	* mk/chsDepend.in: be less chatty.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/mk common.mk,1.51,1.52 chsDepend.in,1.12,1.13

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

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

Modified Files:
	common.mk chsDepend.in 
Log Message:
Do the ghc-pkg registering in a way that works for older ghc versions too.
Make the build a little less chatty.


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chsDepend.in	15 Jan 2005 13:12:05 -0000	1.12
+++ chsDepend.in	16 Jan 2005 21:25:57 -0000	1.13
@@ -50,7 +50,7 @@
     if test -n "$DEPNAMES"; then
       echo "$FULLNAMEHS : $DEPNAMES" >> $FULLNAMEDEP;
     fi;
-    echo Writing dependency information for $FULLNAME
+#    echo Writing dependency information for $FULLNAME
   else
     echo Warning: $FULLNAME not found.
   fi;

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- common.mk	15 Jan 2005 13:12:04 -0000	1.51
+++ common.mk	16 Jan 2005 21:25:41 -0000	1.52
@@ -33,7 +33,6 @@
 #file even though the object files will be in different directories.
 #Obviously the 'subdir-objects' option only works for C/C++ files.
 %.o : %.hs $(CONFIG_H)
-	@echo Building for $(PKG)
 	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
 	$(call getVar,$<,HCFLAGS) -i$(pkgVPATH) \
 	$(addprefix -package-name ,$(notdir $(basename $($(PKG)_PACKAGE)))) \
@@ -43,7 +42,6 @@
 .DELETE_ON_ERROR : %.deps
 
 %.deps :
-	@echo Checking if deps up to date for $@
 	$(strip if test -f $@; then touch $@; else \
 	  touch $@; $(MAKE) $(AM_MAKEFLAGS) NAME="$*" depend; fi;)
 
@@ -58,7 +56,7 @@
 	$($(NAME)_HSFILES))
 
 .chs.dep :
-	@$(CHSDEPEND) -i$(pkgVPATH) $<
+	$(CHSDEPEND) -i$(pkgVPATH) $<
 
 .hs.chi :
 	@:
@@ -91,7 +89,6 @@
 	--precomp=$($(PKG)_PRECOMP) $($(PKG)_HEADER))
 
 .chs.pp.chs: $(CONFIG_H)
-	@echo Preprocessing for $(PKG)
 	$(strip $(HSCPP) $(AM_CPPFLAGS) \
 	$($(PKG)_CPPFLAGS) $($(PKG)_CFLAGS) \
 	$(addprefix -include ,$(CONFIG_H)) \
@@ -109,7 +106,6 @@
         --cc=$(HC) --lflag=-no-hs-main $<)
 
 .chs.hs: 
-	@echo Building .hs file for $(PKG)
 	$(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \
 	if test -x $(C2HS); then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) \
@@ -129,8 +125,8 @@
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
 	$(foreach pkgname,$(pkglib_LIBRARIES), \
+	prefix=$(prefix) exec_prefix=$(exec_prefix) pkglibdir=$(pkglibdir) \
 	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
-	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) -Dpkglibdir=$(pkglibdir)\
 	-i $(call getVar,$(pkgname),PACKAGE);)
 
 uninstall-hook :

[Gtk2hs-commit] gtk2hs/mozembed/Graphics/UI/Gtk/MozEmbed - New directory

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

Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk/MozEmbed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21324/mozembed/Graphics/UI/Gtk/MozEmbed

Log Message:
Directory /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk/MozEmbed added to the repository

[Gtk2hs-commit] gtk2hs ChangeLog,1.296,1.297 configure.ac,1.18,1.19

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

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
bump version to 0.9.7_rc1


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure.ac	14 Jan 2005 13:11:18 -0000	1.18
+++ configure.ac	16 Jan 2005 14:36:37 -0000	1.19
@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(gtk2hs, 0.9.7pre)
+AC_INIT(gtk2hs, 0.9.7_rc1)
 AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- ChangeLog	16 Jan 2005 14:15:30 -0000	1.296
+++ ChangeLog	16 Jan 2005 14:36:37 -0000	1.297
@@ -14,6 +14,13 @@
 	demo/unicode/Arabic.hs demo/unicode/Makefile: update all the demos to
 	use the new module names and write new simple makefiles.
 
+	* Makefile.am: build documentation for all packages. Add installcheck
+	make target that compiles & links all the demos. Arrange for all the
+	demos to be included in the dist tarball. Fix linker problem for gconf
+	due to missing _stub.o file.
+
+	* configure.ac: bump version to 0.9.7_rc1
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs Makefile.am,1.37,1.38

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

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

Modified Files:
	Makefile.am 
Log Message:
Build documentation for all packages.
Add installcheck make target that compiles & links all the demos.
Arrange for all the demos to be included in the dist tarball.
Fix linker problem for gconf due to missing _stub.o file.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Makefile.am	15 Jan 2005 13:12:03 -0000	1.37
+++ Makefile.am	16 Jan 2005 14:34:51 -0000	1.38
@@ -232,6 +232,8 @@
 	glib/System/Glib/GError.chs.pp		\
 	glib/System/Glib/GList.chs
 
+html_HSFILES_EXCLUDE = glib/System/Glib/FFI.hs
+
 glib_System_Glib_Types_hs_HCFLAGS	= -fglasgow-exts
 glib_System_Glib_GError_hs_HCFLAGS	= -fglasgow-exts
 
@@ -417,6 +419,8 @@
 	gtk/Graphics/UI/Gtk/Gdk/DrawWindow.hs				\
 	gtk/Graphics/UI/Gtk/Pango/Markup.hs
 
+html_HSFILES_PREPROC = gtk/Graphics/UI/Gtk.hs
+
 gtk_Graphics_UI_Gtk_hs_HCFLAGS			= -fno-warn-duplicate-exports	#FIXME
 gtk_Graphics_UI_Gtk_Gdk_Enums_hs_HCFLAGS	= -fglasgow-exts
 gtk_Graphics_UI_Gtk_Types_hs_HCFLAGS	        = -fglasgow-exts
@@ -476,31 +480,6 @@
 
 nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi)
 
-if BUILDDOCS
-htmldir = $(datadir)/doc/gtk2hs/html
-html_DATA = \
-	$(foreach HSFILE, $(libHSgtk_a_HSFILES), \
-	$(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE)))) \
-	doc/index.html doc/haddock.css doc/haskell_icon.gif doc/doc-index.html \
-	$(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y, \
-		doc/doc-index-$(LETTER).html) #missing letters Q and Z
-EXCLUDE_DOCS = 
-PREPROC_DOCS = gtk/Graphics/UI/Gtk.hs
-
-$(html_DATA) : $(libHSgtk_a_HSFILES) $(PREPROC_DOCS:.hs=.hs.uncpp)
-	mkdir -p doc
-	$(HADDOCK) --html -o doc \
-		--title="Gtk2Hs" --package=$(libHSgtk_a_NAME) \
-		--dump-interface=doc/gtk.haddock \
-		$(filter-out $(EXCLUDE_DOCS) $(PREPROC_DOCS), $^)
-
-.hs.hs.uncpp : $(CONFIG_H)
-	$(HSCPP) -I. $< -o $@
-
-MOSTLYCLEANFILES += $(html_DATA)
-
-endif #BUILDDOCS
-
 MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi)
 MOSTLYCLEANFILES += \
@@ -541,6 +520,11 @@
 	mogul/Graphics/UI/Gtk/Mogul/TreeList.hs		\
 	mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hs
 
+html_HSFILES_PREPROC += 	\
+	mogul/Graphics/UI/Gtk/Mogul.hs			\
+	mogul/Graphics/UI/Gtk/Mogul/GetWidget.hs	\
+	mogul/Graphics/UI/Gtk/Mogul/NewWidget.hs
+
 am_libHSmogul_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmogul_a_SOURCES))))
 
@@ -659,6 +643,9 @@
 	gconf/System/Gnome/GConf/GConfClient.chs	\
 	gconf/System/Gnome/GConf.hs
 
+libHSgconf_a_LIBADD =	\
+	gconf/System/Gnome/GConf/GConfClient_stub.o
+
 gconf/System/Gnome/GConf/Types.chs :			\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
 	$(srcdir)/tools/hierarchyGen/TypeGenerator  \
@@ -867,4 +854,92 @@
 
 endif #ENABLE_MOZEMBED
 
+#
+#	documentation
+#
+################################################################################
+
+if BUILDDOCS
+
+# For now just build all the docs together, we can think about doing it in a
+# more modular fashion later if it turns out to be useful.
+
+htmldir = $(datadir)/doc/gtk2hs/html
+
+PACKAGES = $(foreach PACKAGE,$(pkglib_LIBRARIES), $(patsubst libHS%.a,%,$(PACKAGE)))
+
+html_HSFILES =  $(filter-out $(html_HSFILES_EXCLUDE) $(html_HSFILES_PREPROC),	\
+		$(foreach PACKAGE,$(PACKAGES),$(libHS$(PACKAGE)_a_HSFILES)))	\
+		$(html_HSFILES_PREPROC:.hs=.hs.uncpp)
+
+html_DATA =									\
+	$(foreach HSFILE, $(html_HSFILES),					\
+	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, doc/%.html, 	\
+		$(subst /,.,$(HSFILE:.uncpp=))))				\
+	doc/haddock.css doc/haskell_icon.gif					\
+	doc/index.html doc/doc-index.html					\
+	$(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y,	\
+		doc/doc-index-$(LETTER).html) #missing letters Q and Z
+
+# --prologue=doc/prologue.txt
+
+$(html_DATA) : $(html_HSFILES)
+	mkdir -p doc
+	$(strip $(HADDOCK) --html --odir=doc \
+		--title="Gtk2Hs" \
+		--dump-interface=doc/gtk2hs.haddock \
+		$^)
+
+.hs.hs.uncpp : $(CONFIG_H)
+	$(HSCPP) -I. $< -o $@
+
+CLEANFILES += $(html_DATA)
+
+endif #BUILDDOCS
+
+#
+#	demos
+#
+################################################################################
+
+DEMOS = demo/hello demo/buttonbox demo/concurrent demo/filechooser \
+	demo/graphic demo/treeList demo/unicode
+if ENABLE_LIBGLADE
+DEMOS += demo/glade demo/profileviewer
+endif
+if ENABLE_GNOME
+DEMOS += demo/gconf demo/sourceview
+endif
+if ENABLE_MOZEMBED
+DEMOS += demo/mozembed
+endif
+
+# For the install check just make sure all the demo programs compile and link
+installcheck-local:
+	$(foreach DEMO,$(DEMOS),$(strip	\
+		make -C $(DEMO) clean &&\
+		make -C $(DEMO) &&	\
+	)) echo ok
+
+EXTRA_DIST +=								\
+	demo/buttonbox/ButtonBox.hs demo/buttonbox/Makefile		\
+	demo/concurrent/Progress.hs demo/concurrent/Makefile 		\
+	demo/filechooser/FileChooserDemo.hs demo/filechooser/Makefile	\
+		demo/filechooser/FileChooserDemo.glade			\
+	demo/gconf/GConfDemo.hs demo/gconf/Makefile			\
+	demo/glade/GladeTest.hs demo/glade/Makefile			\
+		demo/glade/simple.glade 				\
+	demo/graphic/Drawing.hs demo/graphic/Makefile			\
+	demo/hello/World.hs demo/hello/Makefile 			\
+	demo/mozembed/TestEmbedMoz.hs demo/mozembed/Makefile		\
+	demo/profileviewer/ProfileViewer.hs				\
+		demo/profileviewer/ParseProfile.hs			\
+		demo/profileviewer/ProfileViewer.glade			\
+		demo/profileviewer/Makefile				\
+	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
+
+
 include mk/common.mk