gnomemm r1607 - in cluttermm/trunk: . clutter clutter-cairo clutter/cluttermm clutter/src examples tools/extra_defs_gen

[murrayc svn gnome org]

Author: murrayc
Date: Mon Jul 14 09:39:29 2008
New Revision: 1607
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1607&view=rev

Log:
2008-07-14  Murray Cumming  <murrayc murrayc com>

* Makefile.am:
* clutter-cairo/
* clutter/cluttermm.pc.in:
* clutter/cluttermm/init.cc:
* clutter/src/stage.hg:
* clutter/src/texture.hg:
* configure.in:
* examples/Makefile.am:
* examples/Makefile.am_fragment:
* examples/flowers.cc:
* tools/extra_defs_gen/Makefile.am:
* tools/extra_defs_gen/generate_defs_clutter.cc:
* tools/extra_defs_gen/generate_defs_clutter_cairo.cc:
Moved clutter-cairomm into a separate module, though we 
still depend on cairomm because we depend on pangomm (which depends on 
cairomm to wrap pango-cairo sensibly). 

Removed:
   cluttermm/trunk/clutter-cairo/
   cluttermm/trunk/examples/flowers.cc
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/Makefile.am
   cluttermm/trunk/clutter/cluttermm.pc.in
   cluttermm/trunk/clutter/cluttermm/init.cc
   cluttermm/trunk/clutter/src/stage.hg
   cluttermm/trunk/clutter/src/texture.hg
   cluttermm/trunk/configure.in
   cluttermm/trunk/examples/Makefile.am
   cluttermm/trunk/examples/Makefile.am_fragment
   cluttermm/trunk/tools/extra_defs_gen/Makefile.am
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc

Modified: cluttermm/trunk/Makefile.am
==============================================================================
--- cluttermm/trunk/Makefile.am	(original)
+++ cluttermm/trunk/Makefile.am	Mon Jul 14 09:39:29 2008
@@ -1,4 +1,4 @@
-SUBDIRS		= tools clutter clutter-cairo docs examples tests
+SUBDIRS		= tools clutter docs examples tests
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \

Modified: cluttermm/trunk/clutter/cluttermm.pc.in
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.pc.in	(original)
+++ cluttermm/trunk/clutter/cluttermm.pc.in	Mon Jul 14 09:39:29 2008
@@ -5,7 +5,7 @@
 
 Name: cluttermm
 Description: C++ wrapper for clutter
-Requires: gtkmm-2.4 clutter-0.6
+Requires: glibmm-2.4 clutter- API_VER@
 Version: @VERSION@
 Libs: -L${libdir} -lcluttermm- API_VER@
 Cflags: -I${includedir}/cluttermm- API_VER@

Modified: cluttermm/trunk/clutter/cluttermm/init.cc
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/init.cc	(original)
+++ cluttermm/trunk/clutter/cluttermm/init.cc	Mon Jul 14 09:39:29 2008
@@ -17,7 +17,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/wrap_init.h>
 #include <cluttermmconfig.h> //For LIBCLUTTERMM_VERSION
 #include <cluttermm/init.h>
 #include <cluttermm/wrap_init.h>
@@ -29,7 +28,6 @@
 void common_init()
 {
   Glib::init(); //Sets up the g type system and the Glib::wrap() table.
-  Gdk::wrap_init();
   Clutter::wrap_init(); //Tells the Glib::wrap() table about the libcluttermm classes.
 }
 

Modified: cluttermm/trunk/clutter/src/stage.hg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.hg	(original)
+++ cluttermm/trunk/clutter/src/stage.hg	Mon Jul 14 09:39:29 2008
@@ -17,7 +17,6 @@
 
 #include <cluttermm/group.h>
 #include <cluttermm/color.h>
-#include <gdkmm/pixbuf.h>
 #include <clutter/clutter-stage.h> // For ClutterPerspective
  
 _DEFS(cluttermm,clutter)

Modified: cluttermm/trunk/clutter/src/texture.hg
==============================================================================
--- cluttermm/trunk/clutter/src/texture.hg	(original)
+++ cluttermm/trunk/clutter/src/texture.hg	Mon Jul 14 09:39:29 2008
@@ -17,7 +17,6 @@
 
 #include <cluttermm/actor.h>
 #include <cluttermm/types.h>
-#include <gdkmm/pixbuf.h>
 #include <clutter/clutter-texture.h> // For CoglHandle
  
 _DEFS(cluttermm,clutter)

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Mon Jul 14 09:39:29 2008
@@ -37,7 +37,6 @@
 
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(clutter/cluttermmconfig.h)
-AM_CONFIG_HEADER(clutter-cairo/cluttermm-cairo-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -72,18 +71,19 @@
 #  Dependancy checks
 #########################################################################
 
+# Note: We depend on cairomm only because pangomm depends on it
+# (but it was not in the pangomm .pc file until recently).
 PKG_CHECK_MODULES(CLUTTERMM,
-                  clutter-0.8)
+                  [clutter-0.8
+                   glibmm-2.4 >= 2.14
+                   pangomm-1.4 >= 2.12
+                   cairomm-1.0])
 AC_SUBST(CLUTTERMM_CFLAGS)
 AC_SUBST(CLUTTERMM_LIBS)
 
-PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
-                  [clutter-cairo-0.8
-                   cairomm-1.0])
-
 
 # the API version of the library.  Libraries and pkg-config files will have this
-# value appended to them, e.g. libclutter-0.6.so
+# value appended to them, e.g. libclutter-0.8.so
 API_VER=[0.8]
 AC_SUBST(API_VER)
 
@@ -113,12 +113,6 @@
   clutter/cluttermm/Makefile
   clutter/cluttermm/private/Makefile
 
-  clutter-cairo/Makefile
-  clutter-cairo/cluttermm-cairo-$API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
-  clutter-cairo/src/Makefile
-  clutter-cairo/cluttermm-cairo/Makefile
-  clutter-cairo/cluttermm-cairo/private/Makefile
-
   tools/Makefile
     tools/extra_defs_gen/Makefile
     tools/m4/Makefile

Modified: cluttermm/trunk/examples/Makefile.am
==============================================================================
--- cluttermm/trunk/examples/Makefile.am	(original)
+++ cluttermm/trunk/examples/Makefile.am	Mon Jul 14 09:39:29 2008
@@ -2,10 +2,8 @@
 
 include Makefile.am_fragment
 
-noinst_PROGRAMS = actors flowers simple-cairo effect
+noinst_PROGRAMS = actors effect
 actors_SOURCES = test-actors.cc
-flowers_SOURCES = flowers.cc
-simple_cairo_SOURCES = simple-cairo.cc
 effect_SOURCES = effect.cc
 #boxes_SOURCES = test-boxes.cc
 

Modified: cluttermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- cluttermm/trunk/examples/Makefile.am_fragment	(original)
+++ cluttermm/trunk/examples/Makefile.am_fragment	Mon Jul 14 09:39:29 2008
@@ -1,11 +1,8 @@
-local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la \
-					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la
+local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la
 
-LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
+LIBS  = $(CLUTTERMM_LIBS) $(local_cluttermm_libs) 
 
-all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter \
-			   -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
-               $(CLUTTERMM_CFLAGS) $(CLUTTERMM_CAIRO_CFLAGS)
+all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter $(CLUTTERMM_CFLAGS)
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =

Modified: cluttermm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/Makefile.am	Mon Jul 14 09:39:29 2008
@@ -3,11 +3,8 @@
 
 LIBS = -lglibmm_generate_extra_defs-2.4
 
-noinst_PROGRAMS = generate_extra_defs_clutter generate_extra_defs_clutter_cairo
+noinst_PROGRAMS = generate_extra_defs_clutter
 generate_extra_defs_clutter_SOURCES = generate_defs_clutter.cc
-generate_extra_defs_clutter_cairo_SOURCES = generate_defs_clutter_cairo.cc
 
 generate_extra_defs_clutter_CXXFLAGS = $(CLUTTERMM_CFLAGS)
 generate_extra_defs_clutter_LDADD = $(CLUTTERMM_LIBS)
-generate_extra_defs_clutter_cairo_CXXFLAGS = $(CLUTTERMM_CAIRO_CFLAGS)
-generate_extra_defs_clutter_cairo_LDADD = $(CLUTTERMM_CAIRO_LIBS)

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Mon Jul 14 09:39:29 2008
@@ -15,15 +15,14 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "glibmm_generate_extra_defs/generate_extra_defs.h"
-#include <gtk/gtk.h>
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
 #include <clutter/clutter.h>
 #include <iostream>
 
 
 int main (int argc, char *argv[])
 {
-  gtk_init(&argc, &argv) ;
+  clutter_init(&argc, &argv) ;
 
   std::cout 
     << get_defs(CLUTTER_TYPE_ACTOR)