From: Duncan C. <dun...@us...> - 2005-04-06 21:10:53
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15540 Modified Files: ChangeLog Makefile.am configure.ac Log Message: Makefile.am: change the way gtk/Graphics/UI/Gtk/Signals.chs is built. The template file and the module name are now explictly specified. Also, the module no longer has any foreign "wrapper" imports so there is no longer any Signals_stub.o file. configure.ac: remove the check for the four word callback issue since it is no longer relevant. Also remove support for providing an alternate gtkmarshal.list file since it it is not used. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- configure.ac 6 Apr 2005 20:36:10 -0000 1.35 +++ configure.ac 6 Apr 2005 21:10:42 -0000 1.36 @@ -148,17 +148,6 @@ GHC_LIBDIR=`$GHC --print-libdir` GHC_INCLUDEDIR=$GHC_LIBDIR/include -dnl Check if the ghc compiler can generate dynamic callbacks with more than -dnl 4 words worth of arguments. Hopefully one day the compiler will support -dnl this. -AC_MSG_CHECKING([broken dynamic callbacks]) -FOUR_WORD_CALLBACK=no -GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -lt, 9.9.9, [ - if test $host_cpu = sparc; then FOUR_WORD_CALLBACK=yes; fi - dnl TODO: is this only on Sparc Solaris or on all Sparc (ie Linux too)? -]) -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. @@ -496,19 +485,6 @@ CREATE_TYPES="deprecated $CREATE_TYPES"; fi; -dnl Have a special marshall list (available in the source tree of Gtk+ under -dnl gtk/gtkmarshal.list) - -AC_MSG_CHECKING(marshal list) -AC_ARG_WITH(mlist, - [ --with-mlist=GTK-SOURCE use special marshall list from GTK+ sources], - [MARSHALLDEFS=$withval; - AC_MSG_RESULT($withval)], - [MARSHALLDEFS='tools/callbackGen/gtkmarshal.list'; - AC_MSG_RESULT(built-in)]) - - - dnl c2hs Dilemma. dnl Check if the user supplied a specific C->Haskell installation or wants to dnl use the version in the current search path (--with-c2hs-config=yes). @@ -617,7 +593,6 @@ AC_SUBST(GHC_INCLUDEDIR) AC_SUBST(BUILT_IN_C2HS) AC_SUBST(MULTIPLE_CHS) -AC_SUBST(FOUR_WORD_CALLBACK) AC_SUBST(PKGCONF) AC_SUBST(USE_CABAL) AC_SUBST(PKGEXT) @@ -625,7 +600,6 @@ AC_SUBST(C2HS) AC_SUBST(HSC2HS) AC_SUBST(HSCPP) -AC_SUBST(MARSHALLDEFS) AC_SUBST(VERSION) dnl Platform specific flags AC_SUBST(HSCFLAGS) Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- Makefile.am 6 Apr 2005 20:36:09 -0000 1.63 +++ Makefile.am 6 Apr 2005 21:10:42 -0000 1.64 @@ -87,15 +87,6 @@ MOSTLYCLEANFILES+= $(am_tools_callbackGen_HookGenerator_OBJECTS) MOSTLYCLEANFILES+= $(tools_callbackGen_HookGenerator_SOURCES:.hs=.hi) - -gtk/Graphics/UI/Gtk/Signals.chs : \ - $(srcdir)/tools/callbackGen/Signal.chs.template \ - $(srcdir)/tools/callbackGen/gtkmarshal.list \ - $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) - $(strip $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) $(MARSHALLDEFS) \ - $(srcdir)/tools/callbackGen/ $@ \ - $(if $(subst yes,,$(FOUR_WORD_CALLBACK)),--broken)) - # # API Coverage Tool # @@ -259,7 +250,8 @@ $(CC) -c $< -o $@ $(GLIB_CFLAGS) -I$(GHC_INCLUDEDIR) \ -Wall -Wextra -Werror -Wno-unused-parameter -am_libHSglib_a_OBJECTS = $(libHSglib_a_HSFILES:.hs=.$(OBJEXT)) +am_libHSglib_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglib_a_SOURCES)))) libHSglib_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglib_a_SOURCES)) libHSglib_a_CHSFILES = \ @@ -479,7 +471,6 @@ gtk/Graphics/UI/Gtk/Multiline/TextTagTable_stub.o \ gtk/Graphics/UI/Gtk/General/General_stub.o \ gtk/Graphics/UI/Gtk/TreeList/TreeModel_stub.o \ - gtk/Graphics/UI/Gtk/Signals_stub.o \ gtk/Graphics/UI/Gtk/TreeList/TreeSelection_stub.o \ gtk/Graphics/UI/Gtk/TreeList/TreeView_stub.o \ gtk/Graphics/UI/Gtk/TreeList/IconView_stub.o \ @@ -502,6 +493,15 @@ --modname=Graphics.UI.Gtk.Types \ --parentname=System.Glib.GObject) +gtk/Graphics/UI/Gtk/Signals.chs : \ + $(srcdir)/tools/callbackGen/Signal.chs.template \ + $(srcdir)/tools/callbackGen/gtkmarshal.list \ + $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) + $(strip $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) \ + $(srcdir)/tools/callbackGen/gtkmarshal.list \ + $(srcdir)/tools/callbackGen/Signal.chs.template $@ \ + Graphics.UI.Gtk.Signals) + libHSgtk_a_ALLSOURCES = $(libHSgtk_a_SOURCES) $(nodist_libHSgtk_a_SOURCES) am_libHSgtk_a_OBJECTS = \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.428 retrieving revision 1.429 diff -u -d -r1.428 -r1.429 --- ChangeLog 6 Apr 2005 20:46:59 -0000 1.428 +++ ChangeLog 6 Apr 2005 21:10:42 -0000 1.429 @@ -30,6 +30,15 @@ global Signals module. The code dealing with the Sparc 4 word marshaling restriction has been dropped as it is no longer a problem. + * Makefile.am: change the way gtk/Graphics/UI/Gtk/Signals.chs is + built. The template file and the module name are now explictly + specified. Also, the module no longer has any foreign "wrapper" + imports so there is no longer any Signals_stub.o file. + + * configure.ac: remove the check for the four word callback issue + since it is no longer relevant. Also remove support for providing an + alternate gtkmarshal.list file since it it is not used. + 2005-04-5 Duncan Coutts <du...@co...> * glib/System/Glib/UTFString.hs: add some extra functions for |