From: Duncan C. <dun...@us...> - 2005-04-06 20:36:34
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26280 Modified Files: ChangeLog Makefile.am configure.ac Log Message: Makefile.am: build support for new marshalign modules. We need GHC_INCLUDEDIR so we can get at the GHC rts headder files. configure.ac: provide GHC_INCLUDEDIR, which is bascially just `$GHC --print-libdir`/include Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- configure.ac 23 Mar 2005 17:08:57 -0000 1.34 +++ configure.ac 6 Apr 2005 20:36:10 -0000 1.35 @@ -143,6 +143,11 @@ AC_DEFINE_UNQUOTED(__GLASGOW_HASKELL__, $GHC_VERSION_NUMBER, [Version number of GHC.]) +# Get ghc's lib and include dirs. We need the include dir since the HSGClosure +# implementation needs to #include GHC's <Rts.h> +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. @@ -609,6 +614,7 @@ [GHC_DOCDIR=$withval]) dnl Needed substitution. +AC_SUBST(GHC_INCLUDEDIR) AC_SUBST(BUILT_IN_C2HS) AC_SUBST(MULTIPLE_CHS) AC_SUBST(FOUR_WORD_CALLBACK) Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- Makefile.am 5 Apr 2005 18:38:22 -0000 1.62 +++ Makefile.am 6 Apr 2005 20:36:09 -0000 1.63 @@ -12,7 +12,8 @@ tools/hierarchyGen/hierarchy.list \ tools/hierarchyGen/Hierarchy.chs.template \ sourceview/sourceview.h \ - gtk/wingtk.h + gtk/wingtk.h \ + glib/System/Glib/hsgclosure.h # There are no other files in these dirs and tar excludes empty dirs dist-hook: @@ -237,16 +238,27 @@ glib/System/Glib/GObject.chs.pp \ glib/System/Glib/Attributes.hs \ glib/System/Glib/GError.chs.pp \ - glib/System/Glib/GList.chs + glib/System/Glib/GList.chs \ + glib/System/Glib/Signals.chs \ + glib/System/Glib/hsgclosure.c -html_HSFILES_EXCLUDE = glib/System/Glib/FFI.hs +html_HSFILES_EXCLUDE = \ + glib/System/Glib/FFI.hs \ + glib/System/Glib/Signals.hs glib_System_Glib_Types_hs_HCFLAGS = -fglasgow-exts glib_System_Glib_GError_hs_HCFLAGS = -fglasgow-exts +glib_System_Glib_Signals_hs_HCFLAGS = '-\#include"hsgclosure.h"' libHSglib_a_LIBADD = \ glib/System/Glib/GObject_stub.o +# Special CFLAGS for building the closure implementation since it needs +# to #include <Rts.h> from GHC's include directory. +glib/System/Glib/hsgclosure.o : glib/System/Glib/hsgclosure.c + $(CC) -c $< -o $@ $(GLIB_CFLAGS) -I$(GHC_INCLUDEDIR) \ + -Wall -Wextra -Werror -Wno-unused-parameter + am_libHSglib_a_OBJECTS = $(libHSglib_a_HSFILES:.hs=.$(OBJEXT)) libHSglib_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglib_a_SOURCES)) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.426 retrieving revision 1.427 diff -u -d -r1.426 -r1.427 --- ChangeLog 6 Apr 2005 20:31:27 -0000 1.426 +++ ChangeLog 6 Apr 2005 20:36:09 -0000 1.427 @@ -15,6 +15,12 @@ marshaling code. Basically adds connectGeneric which is used by all the per-type marshaling functions. + * Makefile.am: build support for new marshalign modules. We need + GHC_INCLUDEDIR so we can get at the GHC rts headder files. + + * configure.ac: provide GHC_INCLUDEDIR, which is bascially just + `$GHC --print-libdir`/include + 2005-04-5 Duncan Coutts <du...@co...> * glib/System/Glib/UTFString.hs: add some extra functions for |