Menu
▾
▴
[Gtk2hs-commit] gtk2hs ChangeLog,1.429,1.430 Makefile.am,1.64,1.65 configure.ac,1.36,1.37
|
From: Duncan C. <dun...@us...> - 2005-04-06 21:28:05
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27051 Modified Files: ChangeLog Makefile.am configure.ac 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: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- configure.ac 6 Apr 2005 21:10:42 -0000 1.36 +++ configure.ac 6 Apr 2005 21:27:39 -0000 1.37 @@ -401,8 +401,8 @@ LIBGLADE_CFLAGS=`CFLAGS="$GLIB_CFLAGS $GTK_CFLAGS" SED=$SED GREP=$GREP tools/checkDirs.sh $LIBGLADE_CFLAGS`; LIBGLADE_LIBS=`LDFLAGS="$GLIB_LIBS $GTK_LIBS" SED=$SED GREP=$GREP tools/checkDirs.sh $LIBGLADE_LIBS`; -GCONF_CFLAGS=`CFLAGS="$GLIB_CFLAGS $GTK_CFLAGS" SED=$SED GREP=$GREP tools/checkDirs.sh $GCONF_CFLAGS`; -GCONF_LIBS=`LDFLAGS="$GLIB_LIBS $GTK_LIBS" SED=$SED GREP=$GREP tools/checkDirs.sh $GCONF_LIBS`; +GCONF_CFLAGS=`CFLAGS="$GLIB_CFLAGS" SED=$SED GREP=$GREP tools/checkDirs.sh $GCONF_CFLAGS`; +GCONF_LIBS=`LDFLAGS="$GLIB_LIBS" SED=$SED GREP=$GREP tools/checkDirs.sh $GCONF_LIBS`; MOZEMBED_CFLAGS=`CFLAGS="$GLIB_CFLAGS $GTK_CFLAGS" tools/checkDirs.sh $MOZEMBED_CFLAGS`; MOZEMBED_LIBS=`LDFLAGS="$GLIB_LIBS $GTK_LIBS" SED=$SED GREP=$GREP tools/checkDirs.sh $MOZEMBED_LIBS`; Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- Makefile.am 6 Apr 2005 21:10:42 -0000 1.64 +++ Makefile.am 6 Apr 2005 21:27:39 -0000 1.65 @@ -674,17 +674,18 @@ libHSgconf_a_PACKAGEDEPS = libHSgconf_a_HEADER = gconf/gconf-client.h libHSgconf_a_PRECOMP = gconf/gconf.precomp -libHSgconf_a_LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GCONF_LIBS) +libHSgconf_a_LIBS = $(GLIB_LIBS) $(GCONF_LIBS) libHSgconf_a_HCFLAGS = -fglasgow-exts -fallow-overlapping-instances \ $(if $(USE_CABAL),-ignore-package glib) -libHSgconf_a_CFLAGS = $(filter-out -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS)) -libHSgconf_a_CPPFLAGS = $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS)) +libHSgconf_a_CFLAGS = $(filter-out -I% -D%,$(GLIB_CFLAGS) $(GCONF_CFLAGS)) +libHSgconf_a_CPPFLAGS = $(filter -I% -D%,$(GLIB_CFLAGS) $(GCONF_CFLAGS)) -libHSgconf_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) gconf -gconf/libHSgconf_a.deps : gtk/libHSgtk_a.deps +libHSgconf_a_SOURCESDIRS = $(libHSglib_a_SOURCESDIRS) gconf +gconf/libHSgconf_a.deps : glib/libHSglib_a.deps libHSgconf_a_GENERATEDSOURCES = \ - gconf/System/Gnome/GConf/Types.chs + gconf/System/Gnome/GConf/Types.chs \ + gconf/System/Gnome/GConf/Signals.chs nodist_libHSgconf_a_SOURCES = $(libHSgconf_a_GENERATEDSOURCES) @@ -708,6 +709,15 @@ $@ --tag=gconf --lib=gconf --prefix=gconf \ --modname=System.Gnome.GConf.Types --parentname=System.Glib.GObject) +gconf/System/Gnome/GConf/Signals.chs : \ + $(srcdir)/tools/callbackGen/Signal.chs.template \ + $(srcdir)/gconf/System/Gnome/GConf/marshal.list \ + $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) + $(strip $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) \ + $(srcdir)/gconf/System/Gnome/GConf/marshal.list \ + $(srcdir)/tools/callbackGen/Signal.chs.template $@ \ + System.Gnome.GConf.Signals) + libHSgconf_a_ALLSOURCES = $(libHSgconf_a_SOURCES) $(nodist_libHSgconf_a_SOURCES) am_libHSgconf_a_OBJECTS = \ @@ -742,7 +752,6 @@ DISTCLEANFILES+= gconf/libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep) $(libHSgconf_a_CHSFILES:.chs=.dep) : \ - $(libHSgtk_a_GENERATEDSOURCES) \ $(libHSgconf_a_GENERATEDSOURCES) -include $(libHSgconf_a_CHSFILES:.chs=.dep) gconf/libHSgconf_a.deps Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.429 retrieving revision 1.430 diff -u -d -r1.429 -r1.430 --- ChangeLog 6 Apr 2005 21:10:42 -0000 1.429 +++ ChangeLog 6 Apr 2005 21:27:39 -0000 1.430 @@ -39,6 +39,22 @@ since it is no longer relevant. Also remove support for providing an alternate gtkmarshal.list file since it it is not used. + * gconf/System/Gnome/GConf/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. + + * gconf/System/Gnome/GConf/GConfClient.chs: import local Signals + module so that we can eliminate the dependency of the gconf package on + gtk package. + + * gconf/gconf.cabal.in, gconf/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. + 2005-04-5 Duncan Coutts <du...@co...> * glib/System/Glib/UTFString.hs: add some extra functions for |
