[Gtk2hs-commit] gtk2hs/gconf gconf.cabal.in,1.1,1.2 gconf.pkg.in,1.4,1.5

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

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

Modified Files:
	gconf.cabal.in gconf.pkg.in 
Log Message:
Make the gconf package depend only on glib not on gtk. The only dependency
previously was on the Signals module from the gtk package, so use a local
Signals module instead with just the one marshaler that is needed:

marshal.list: add local marshal list that contains the callback types that
	gconf needs.

Makefile.am: generate a Signals module for the gconf package. Also make it
	inherit it's build settings from glib rather than gtk.

GConfClient.chs: import local Signals module so that we can eliminate the
	dependency of the gconf package on the gtk package.

gconf.cabal.in, gconf.pkg.in: change the dep from gtk to glib.

configure.ac: change the gconf flags so that they inherit from glib rather
	than gtk.


Index: gconf.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/gconf.pkg.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gconf.pkg.in	16 Jan 2005 21:44:15 -0000	1.4
+++ gconf.pkg.in	6 Apr 2005 21:27:40 -0000	1.5
@@ -8,7 +8,7 @@
      extra_libraries = [@GCONF_LIBS_CQ@],
      include_dirs    = [@GCONF_CFLAGS_CQ@],
      c_includes      = ["gconf/gconf-client.h"],
-     package_deps    = ["gtk"],
+     package_deps    = ["glib"],
      extra_ghc_opts  = [],
      extra_cc_opts   = [],
      extra_ld_opts   = [@GCONF_LIBEXTRA_CQ@]

Index: gconf.cabal.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/gconf.cabal.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gconf.cabal.in	23 Mar 2005 17:08:57 -0000	1.1
+++ gconf.cabal.in	6 Apr 2005 21:27:40 -0000	1.2
@@ -13,5 +13,5 @@
 extra-libraries: @GCONF_LIBS_CQ@
 include-dirs: @GCONF_CFLAGS_CQ@
 includes: gconf/gconf-client.h
-depends: gtk-@PACKAGE_VERSION@
+depends: glib-@PACKAGE_VERSION@
 extra-ld-opts: @GCONF_LIBEXTRA_CQ@