gnomemm r1604 - in cluttermm/trunk: . clutter-gtk examples scripts

[murrayc svn gnome org]

Author: murrayc
Date: Mon Jul 14 08:42:28 2008
New Revision: 1604
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1604&view=rev

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

* Makefile.am:
* clutter-gtk/
* configure.in:
* examples/Makefile.am:
* examples/Makefile.am_fragment:
* examples/embed-gtk.cc: Moved clutter-gtkmm into a separate module, 
because someone did not want to use gtkmm.
clutter-cairomm is still there, but maybe we should remove that too.

Ths does not actually build yet because clutter-cairo-0.8 does not exist yet.

Removed:
   cluttermm/trunk/clutter-gtk/
   cluttermm/trunk/examples/embed-gtk.cc
   cluttermm/trunk/scripts/ltmain.sh
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/Makefile.am
   cluttermm/trunk/configure.in
   cluttermm/trunk/examples/Makefile.am
   cluttermm/trunk/examples/Makefile.am_fragment

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

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Mon Jul 14 08:42:28 2008
@@ -38,7 +38,6 @@
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(clutter/cluttermmconfig.h)
 AM_CONFIG_HEADER(clutter-cairo/cluttermm-cairo-config.h)
-AM_CONFIG_HEADER(clutter-gtk/cluttermm-gtk-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -74,19 +73,14 @@
 #########################################################################
 
 PKG_CHECK_MODULES(CLUTTERMM,
-                  gtkmm-2.4 >= 2.10.9
-                  clutter-0.7)
+                  clutter-0.8)
 AC_SUBST(CLUTTERMM_CFLAGS)
 AC_SUBST(CLUTTERMM_LIBS)
 
 PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
-                  [gtkmm-2.4
-                   clutter-cairo-0.7
+                  [clutter-cairo-0.8
                    cairomm-1.0])
 
-PKG_CHECK_MODULES(CLUTTERMM_GTK,
-                  [gtkmm-2.4
-                   clutter-gtk-0.7])
 
 # the API version of the library.  Libraries and pkg-config files will have this
 # value appended to them, e.g. libclutter-0.6.so
@@ -125,12 +119,6 @@
   clutter-cairo/cluttermm-cairo/Makefile
   clutter-cairo/cluttermm-cairo/private/Makefile
 
-  clutter-gtk/Makefile
-  clutter-gtk/cluttermm-gtk-$API_VER.pc:clutter-gtk/cluttermm-gtk.pc.in
-  clutter-gtk/src/Makefile
-  clutter-gtk/cluttermm-gtk/Makefile
-  clutter-gtk/cluttermm-gtk/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 08:42:28 2008
@@ -2,11 +2,10 @@
 
 include Makefile.am_fragment
 
-noinst_PROGRAMS = actors flowers simple-cairo embed-gtk effect
+noinst_PROGRAMS = actors flowers simple-cairo effect
 actors_SOURCES = test-actors.cc
 flowers_SOURCES = flowers.cc
 simple_cairo_SOURCES = simple-cairo.cc
-embed_gtk_SOURCES = embed-gtk.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 08:42:28 2008
@@ -1,13 +1,11 @@
 local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la \
-					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la \
-					   $(top_builddir)/clutter-gtk/cluttermm-gtk/libcluttermm-gtk-$(API_VER).la
+					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la
 
-LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(CLUTTERMM_GTK_LIBS) $(local_cluttermm_libs) 
+LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
 
 all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter \
 			   -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
-			   -I$(top_builddir)/clutter-gtk -I$(top_srcdir)/clutter-gtk \
-               $(CLUTTERMM_CFLAGS) $(CLUTTERMM_CAIRO_CFLAGS) $(CLUTTERMM_GTK_CFLAGS)
+               $(CLUTTERMM_CFLAGS) $(CLUTTERMM_CAIRO_CFLAGS)
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =