Menu
▾
▴
[Gtk2hs-commit] gtk2hs ChangeLog,1.339,1.340 configure.ac,1.26,1.27 Makefile.am,1.45,1.46
|
From: Duncan C. <dun...@us...> - 2005-02-07 00:04:37
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21618 Modified Files: ChangeLog configure.ac Makefile.am Log Message: Various win32 fixes. configure.ac: Do not define WIN32 on windows since it is already defined on that platform. Define a conditional so that Makefile.am can conditonally compile a few modules. We no longer need to pass -fnative-struct to gcc on windows. Makefile.am: Add $(EXEEXT) in a few places to so names of dependencies are correct on windows. Only compile the plug and socket modules on non-win32 platforms. C2HSConfig.hs.in: comment out the @TMPDIR@ substitution since it causes problems in windows and is not used anyway. CParser.hs: make c2hs accept __attribute__'s on declerations of functions returning pointer types. This is needed for some mingw header file (float.h). Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- configure.ac 24 Jan 2005 16:06:18 -0000 1.26 +++ configure.ac 7 Feb 2005 00:04:27 -0000 1.27 @@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script. dnl ###################################################################### -AC_INIT(gtk2hs, 0.9.7) +AC_INIT(gtk2hs, 0.9.8_pre) AM_INIT_AUTOMAKE dnl * We require autoconf version 2.50 @@ -108,7 +108,7 @@ *mingw32* ) PATHSED=["s+/\([a-z]\)/+\1:/+"];; * ) PATHSED=["\#"];; esac; - HSCFLAGS=" -C -optc-fnative-struct"; + HSCFLAGS=; #we used to need "-C -optc-fnative-struct" but no longer it seems C2HSFLAGS=; dnl Where are we? (only used during configuration) TOP=`$PWD | $SED $PATHSED`; @@ -116,9 +116,7 @@ CREATE_TYPES=default; fi; -if test "$WIN32" = "yes"; then - AC_DEFINE(WIN32, [], [Are we building on a Win32 system]) -fi +AM_CONDITIONAL(WIN32, test "$WIN32" = "yes") dnl determine a temporary directory for c2hs TMPDIR="/tmp" Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Makefile.am 24 Jan 2005 14:59:39 -0000 1.45 +++ Makefile.am 7 Feb 2005 00:04:27 -0000 1.46 @@ -91,8 +91,8 @@ $(srcdir)/tools/callbackGen/Signal.chs-boot1 \ $(srcdir)/tools/callbackGen/Signal.chs-boot2 \ $(srcdir)/tools/callbackGen/gtkmarshal.list \ - $(srcdir)/tools/callbackGen/HookGenerator - $(strip $(srcdir)/tools/callbackGen/HookGenerator $(MARSHALLDEFS) \ + $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) + $(strip $(srcdir)/tools/callbackGen/HookGenerator$(EXEEXT) $(MARSHALLDEFS) \ $(srcdir)/tools/callbackGen/ $@ \ $(if $(subst yes,,$(FOUR_WORD_CALLBACK)),--broken)) @@ -407,18 +407,27 @@ gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp \ gtk/Graphics/UI/Gtk/Pango/Layout.chs \ gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp \ - gtk/Graphics/UI/Gtk/Embedding/Plug.chs \ - gtk/Graphics/UI/Gtk/Embedding/Socket.chs \ gtk/Graphics/UI/Gtk/General/StockItems.hsc \ gtk/Graphics/UI/Gtk/General/Structs.hsc \ gtk/Graphics/UI/Gtk/Gdk/Events.hsc \ - gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc \ gtk/Graphics/UI/Gtk/Abstract/Scrollbar.hs \ gtk/Graphics/UI/Gtk/Abstract/Separator.hs \ gtk/Graphics/UI/Gtk/TreeList/CellRenderer.hs \ gtk/Graphics/UI/Gtk/Gdk/DrawWindow.hs \ gtk/Graphics/UI/Gtk/Pango/Markup.hs +if !WIN32 +libHSgtk_a_SOURCES += \ + gtk/Graphics/UI/Gtk/Embedding/Plug.chs \ + gtk/Graphics/UI/Gtk/Embedding/Socket.chs \ + gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc +endif + +EXTRA_libHSgtk_a_SOURCES = \ + gtk/Graphics/UI/Gtk/Embedding/Plug.chs \ + gtk/Graphics/UI/Gtk/Embedding/Socket.chs \ + gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc + html_HSFILES_PREPROC = gtk/Graphics/UI/Gtk.hs gtk_Graphics_UI_Gtk_hs_HCFLAGS = -fno-warn-duplicate-exports #FIXME @@ -448,9 +457,9 @@ gtk/Graphics/UI/Gtk/Types.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ $(addprefix --tag=,$(CREATE_TYPES)) \ @@ -568,9 +577,9 @@ glade_Graphics_UI_Gtk_Glade_Types_hs_HCFLAGS = -fglasgow-exts glade/Graphics/UI/Gtk/Glade/Types.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ --tag=libglade --lib=glade --prefix=glade \ @@ -645,9 +654,9 @@ gconf/System/Gnome/GConf/Types.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ --tag=gconf --lib=gconf --prefix=gconf \ @@ -733,9 +742,9 @@ sourceview/Graphics/UI/Gtk/SourceView/Types.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ --tag=sourceview --parentname=Graphics.UI.Gtk.Types \ @@ -806,9 +815,9 @@ mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator$(EXEEXT) \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ $@ --tag=mozembed --parentname=Graphics.UI.Gtk.Types \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.339 retrieving revision 1.340 diff -u -d -r1.339 -r1.340 --- ChangeLog 5 Feb 2005 02:57:39 -0000 1.339 +++ ChangeLog 7 Feb 2005 00:04:26 -0000 1.340 @@ -1,3 +1,22 @@ +2005-02-06 Duncan Coutts <du...@co...> + + * configure.ac: win32 fixes. Do not define WIN32 on windows since it + is already defined o that platform. Define a conditional so that + Makefile.am can conditonally compile a few modules. We no longer need + to pass -fnative-struct to gcc on windows. + + * Makefile.am: win32 fixes. Add $(EXEEXT) in a few places to so names + of dependencies are correct on windows. Only compile the plug and + socket modules on non-win32 platforms. + + * tools/c2hs/toplevel/C2HSConfig.hs.in: comment out the @TMPDIR@ + substitution since it causes problems in windows and is not used + anyway. + + * tools/c2hs/c/CParser.hs: make c2hs accept __attribute__'s on + declerations of functions returning pointer types. This is needed for + some mingw header file. + 2005-02-05 Duncan Coutts <du...@co...> * tools/apiGen/ApiGen.hs: add support for interfaces, deal with |
