[Gtk2hs-commit] gtk2hs ChangeLog,1.258,1.259 configure.ac,1.12,1.13 Makefile.am,1.26,1.27

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ChangeLog configure.ac Makefile.am 
Log Message:
New bindings to GtkMozEmbed contributed by Wolfram Kahl <ka...@ca...>
(with previous work by Scott West and Jonas Svensson).
New class and signal added to hierarchy.list and gtkmarshal.list
Build support for mozembed package added to configure.ac and Makefile.am

Fix to mk/common.mk to not -#include<config.h> when compiling .hs to .o as it
is unnecessary and breaks for modules that do not have -I/usr/include/gtk-2.0
in their CPPFLAGS.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- configure.ac	12 Dec 2004 14:28:12 -0000	1.12
+++ configure.ac	17 Dec 2004 21:21:38 -0000	1.13
@@ -250,6 +250,12 @@
 
 AC_MSG_RESULT($ENABLE_GNOME)
 
+AC_ARG_ENABLE(mozilla,
+              [  --disable-mozilla       do not generate bindings for the Mozilla display widget],
+              [ENABLE_MOZEMBED=$enableval],[ENABLE_MOZEMBED=yes])
+
+AC_MSG_RESULT($ENABLE_MOZEMBED)
+
 dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES
 dnl macro from the pkg-config program.
 PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0])
@@ -263,6 +269,9 @@
   PKG_CHECK_MODULES(GCONF,[gconf-2.0 >= 2.0.0])
   PKG_CHECK_MODULES(SOURCEVIEW,[gtksourceview-1.0 >= 0.6.0])
 fi
+if test x$ENABLE_MOZEMBED = xyes; then
+  PKG_CHECK_MODULES(MOZEMBED,[mozilla-gtkmozembed >= 1.4])
+fi
 
 dnl Some APIs only appeared in later versions of libraries. Generate only
 dnl Haskell types for the available C types.
@@ -283,6 +292,8 @@
 LIBGLADE_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $LIBGLADE_LIBS`;
 GCONF_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $GCONF_CFLAGS`;
 GCONF_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $GCONF_LIBS`;
+MOZEMBED_CFLAGS=`CFLAGS="$GTK_CFLAGS" tools/checkDirs.sh $MOZEMBED_CFLAGS`;
+MOZEMBED_LIBS=`LDFLAGS="$GTK_LIBS" tools/checkDirs.sh $MOZEMBED_LIBS`;
 
 
 dnl Change the representation of these flags to "flag1","flag2". The
@@ -320,6 +331,14 @@
 AC_SUBST(GCONF_LIBDIR_CQ)
 AC_SUBST(GCONF_LIBEXTRA_CQ)
 
+GTKHS_REFORMAT_PACKAGE_CFLAGS(MOZEMBED_CFLAGS, MOZEMBED_CFLAGS_CQ)
+GTKHS_REFORMAT_PACKAGE_LIBS(MOZEMBED_LIBS, MOZEMBED_LIBS_CQ,
+                            MOZEMBED_LIBDIR_CQ, MOZEMBED_LIBEXTRA_CQ)
+AC_SUBST(MOZEMBED_CFLAGS_CQ)
+AC_SUBST(MOZEMBED_LIBS_CQ)
+AC_SUBST(MOZEMBED_LIBDIR_CQ)
+AC_SUBST(MOZEMBED_LIBEXTRA_CQ)
+
 AC_ARG_WITH(hidir,
 	[  --with-hidir=DIR		specify install dir for .hi files],
 	[hidir=$withval],
@@ -513,7 +532,8 @@
   mogul/mogul.pkg
   glade/glade.pkg
   gconf/gconf.pkg
-  sourceview/sourceview.pkg],
+  sourceview/sourceview.pkg
+  mozembed/mozembed.pkg],
   [chmod a+x mk/chsDepend && chmod a+x install-sh])
 
 dnl ...and chat with the user

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	13 Dec 2004 23:57:05 -0000	1.26
+++ Makefile.am	17 Dec 2004 21:21:38 -0000	1.27
@@ -20,7 +20,7 @@
 	tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c	     \
 	tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel   \
 	mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf	     \
-	sourceview
+	sourceview mozembed
 
 EXTRA_DIST = \
 	tools/callbackGen/Signal.chs-boot1	\
@@ -43,7 +43,8 @@
         libHSmogul.a	\
         libHSglade.a	\
         libHSgconf.a	\
-        libHSsourceview.a
+        libHSsourceview.a	\
+	libHSmozembed.a
 
 noinst_PROGRAMS = \
 	tools/hierarchyGen/TypeGenerator \
@@ -631,11 +632,74 @@
 -include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep)
  endif
 
+#
+#	mozembed package
+#
+################################################################################
+
+libHSmozembed_a_NAME = libHSmozembed.a
+$(libHSmozembed_a_NAME) : NAME = libHSmozembed_a
+
+libHSmozembed_a_PACKAGE		= mozembed/mozembed.pkg
+libHSmozembed_a_PACKAGEDEPS	= 
+libHSmozembed_a_HEADER 		= gtkmozembed.h
+libHSmozembed_a_PRECOMP		= mozembed/mozembed.precomp
+libHSmozembed_a_LIBS		= $(MOZEMBED_LIBS)
+libHSmozembed_a_HCFLAGS		= -fffi
+libHSmozembed_a_CFLAGS		= $(filter-out -I% -D%,$(GTK_CFLAGS) $(MOZEMBED_CFLAGS))
+libHSmozembed_a_CPPFLAGS	= $(filter -I% -D%,$(GTK_CFLAGS) $(MOZEMBED_CFLAGS))
+
+libHSmozembed_a_SOURCES =				\
+	mozembed/Graphics/UI/Gtk/MozEmbedType.chs	\
+	mozembed/Graphics/UI/Gtk/MozEmbed.chs
+
+mozembed_Graphics_UI_Gtk_MozEmbedType_hs_HCFLAGS = -fglasgow-exts
+
+libHSmozembed_a_DEPENDENCIES = libHSgtk.a
+
+mozembed/Graphics/UI/Gtk/MozEmbedType.chs :	\
+	$(srcdir)/tools/hierarchyGen/hierarchy.list \
+	$(srcdir)/tools/hierarchyGen/TypeGenerator
+	$(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \
+	$(srcdir)/tools/hierarchyGen/hierarchy.list \
+	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
+	$@ --tag=mozembed --parentname=Hierarchy \
+	--modname=Graphics.UI.Gtk.MozEmbedType)
+
+am_libHSmozembed_a_OBJECTS = \
+	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmozembed_a_SOURCES))))
+
+libHSmozembed_a_CHSPPFILES = $(filter %.chs.pp,$(libHSmozembed_a_SOURCES))
+libHSmozembed_a_CHSFILES = \
+  $(filter %.chs,$(libHSmozembed_a_SOURCES:.chs.pp=.chs))
+libHSmozembed_a_CHSFILES_HS = $(libHSmozembed_a_CHSFILES:.chs=.hs)
+libHSmozembed_a_HSCFILES = $(filter %.hsc, $(libHSmozembed_a_SOURCES))
+libHSmozembed_a_HSCFILES_HS = $(libHSmozembed_a_HSCFILES:.hsc=.hs)
+libHSmozembed_a_BUILDSOURCES = \
+	$(libHSmozembed_a_CHSPPFILES:.chs.pp=.chs) \
+	$(libHSmozembed_a_CHSFILES_HS) \
+        $(libHSmozembed_a_HSCFILES_HS) \
+        mozembed/Graphics/UI/Gtk/MozEmbedType.chs
+libHSmozembed_a_HSFILES  = \
+	$(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \
+	$(filter %.hs,$(libHSmozembed_a_SOURCES))
+
+MOSTLYCLEANFILES += $(am_libHSmozembed_a_OBJECTS)
+MOSTLYCLEANFILES += $(libHSmozembed_a_HSFILES:.hs=.hi)
+CLEANFILES += $(libHSmozembed_a_BUILDSOURCES) 
+
+DISTCLEANFILES+= libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep)
+
+ifneq ($(MAKECMDGOALS),clean)
+-include libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES:.chs=.dep)
+ endif
+
 
 # All generated source files go here.
 BUILDSOURCES =	$(libHSgtk_a_BUILDSOURCES)	\
 		$(libHSglade_a_BUILDSOURCES)	\
 		$(libHSgconf_a_BUILDSOURCES)	\
-		$(libHSsourceview_a_BUILDSOURCES)
+		$(libHSsourceview_a_BUILDSOURCES) \
+		$(libHSmozembed_a_BUILDSOURCES)
 
 include mk/common.mk

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- ChangeLog	14 Dec 2004 13:18:01 -0000	1.258
+++ ChangeLog	17 Dec 2004 21:21:35 -0000	1.259
@@ -1,3 +1,24 @@
+2004-12-17 Duncan Coutts <du...@co...>
+
+	* mozembed/Graphics/UI/Gtk/MozEmbed.chs: new bindings to GtkMozEmbed
+	contributed by Wolfram Kahl <ka...@ca...> (with previous work
+	by Scott West and Jonas Svensson).
+
+	* mozembed/mozembed.pkg.in: new package file
+
+	* tools/hierarchyGen/hierarchy.list,
+	tools/callbackGen/gtkmarshal.list: class definition and extra signal
+	prototype for GtkMozEmbed.
+
+	* configure.ac: checks for version of mozilla-gtkmozembed and get
+	CFLAGS etc.
+
+	* Makefile.am: add support for building the mozembed package.
+
+	* mk/common.mk: do not -#include<config.h> when compiling .hs to .o as
+	it is unnecessary and breaks for modules that do not have
+	-I/usr/include/gtk-2.0 in their CPPFLAGS.
+
 2004-12-14 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: quoting/escaping fix so that headers are -#include'd



