gnomemm r1621 - in clutter-gtkmm/trunk: . clutter clutter-cairo clutter-gtk clutter-gtk/clutter-gtkmm clutter-gtk/clutter-gtkmm/private clutter-gtk/cluttermm-gtk clutter-gtk/src docs/reference examples scripts tools/extra_defs_gen

From: siavashs svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r1621 - in clutter-gtkmm/trunk: . clutter clutter-cairo clutter-gtk clutter-gtk/clutter-gtkmm clutter-gtk/clutter-gtkmm/private clutter-gtk/cluttermm-gtk clutter-gtk/src docs/reference examples scripts tools/extra_defs_gen
Date: Wed, 23 Jul 2008 19:01:09 +0000 (UTC)
Author: siavashs
Date: Wed Jul 23 19:01:09 2008
New Revision: 1621
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1621&view=rev

Log:
Updated all sources to use clutter-gtkmm

    * autogen.sh:
    * clutter-cairo/Makefile.am:
    * clutter-cairo/README:
    * clutter-cairo/cluttermm-cairo-config.h.in:
    * clutter-cairo/cluttermm-cairo.h:
    * clutter-cairo/cluttermm-cairo.pc.in:
    * clutter-cairo/cluttermm-cairo/Makefile.am:
    * clutter-cairo/cluttermm-cairo/init.cc:
    * clutter-cairo/cluttermm-cairo/init.h:
    * clutter-cairo/cluttermm-cairo/private/Makefile.am:
    * clutter-cairo/cluttermm-cairo/wrap_init.h:
    * clutter-cairo/src/Makefile.am:
    * clutter-cairo/src/Makefile_list_of_hg.am_fragment:
    * clutter-cairo/src/cairo-texture.ccg:
    * clutter-cairo/src/cairo-texture.hg:
    * clutter-cairo/src/clutter-cairo.defs:
    * clutter-cairo/src/clutter-cairo_docs.xml:
    * clutter-cairo/src/clutter-cairo_methods.defs:
    * clutter-cairo/src/clutter-cairo_others.defs:
    * clutter-cairo/src/clutter-cairo_signals.defs:
    * clutter-gtk/Makefile.am:
    * clutter-gtk/clutter-gtkmm.h:
    * clutter-gtk/clutter-gtkmm.pc.in:
    * clutter-gtk/clutter-gtkmm/Makefile.am:
    * clutter-gtk/clutter-gtkmm/init.cc:
    * clutter-gtk/clutter-gtkmm/init.h:
    * clutter-gtk/clutter-gtkmm/private/Makefile.am:
    * clutter-gtk/clutter-gtkmm/wrap_init.h:
    * clutter-gtk/cluttermm-gtk-config.h.in:
    * clutter-gtk/cluttermm-gtk.h:
    * clutter-gtk/cluttermm-gtk.pc.in:
    * clutter-gtk/cluttermm-gtk/Makefile.am:
    * clutter-gtk/cluttermm-gtk/init.cc:
    * clutter-gtk/cluttermm-gtk/init.h:
    * clutter-gtk/cluttermm-gtk/private/Makefile.am:
    * clutter-gtk/cluttermm-gtk/wrap_init.h:
    * clutter-gtk/src/Makefile.am:
    * clutter-gtk/src/embed.hg:
    * clutter/Makefile.am:
    * clutter/README:
    * clutter/cluttermm.h:
    * clutter/cluttermm.pc.in:
    * clutter/cluttermm/Makefile.am:
    * clutter/cluttermm/event.cc:
    * clutter/cluttermm/event.h:
    * clutter/cluttermm/frame-source.cc:
    * clutter/cluttermm/frame-source.h:
    * clutter/cluttermm/init.cc:
    * clutter/cluttermm/init.h:
    * clutter/cluttermm/main.cc:
    * clutter/cluttermm/main.h:
    * clutter/cluttermm/private/Makefile.am:
    * clutter/cluttermm/threads.cc:
    * clutter/cluttermm/threads.h:
    * clutter/cluttermm/utility.cc:
    * clutter/cluttermm/utility.h:
    * clutter/cluttermm/wrap_init.h:
    * clutter/cluttermmconfig.h.in:
    * clutter/src/Makefile.am:
    * clutter/src/Makefile_list_of_hg.am_fragment:
    * clutter/src/actor.ccg:
    * clutter/src/actor.hg:
    * clutter/src/alpha.ccg:
    * clutter/src/alpha.hg:
    * clutter/src/behaviour-bspline.ccg:
    * clutter/src/behaviour-bspline.hg:
    * clutter/src/behaviour-depth.ccg:
    * clutter/src/behaviour-depth.hg:
    * clutter/src/behaviour-ellipse.ccg:
    * clutter/src/behaviour-ellipse.hg:
    * clutter/src/behaviour-opacity.ccg:
    * clutter/src/behaviour-opacity.hg:
    * clutter/src/behaviour-path.ccg:
    * clutter/src/behaviour-path.hg:
    * clutter/src/behaviour-rotate.ccg:
    * clutter/src/behaviour-rotate.hg:
    * clutter/src/behaviour-scale.ccg:
    * clutter/src/behaviour-scale.hg:
    * clutter/src/behaviour.ccg:
    * clutter/src/behaviour.hg:
    * clutter/src/box.ccg:
    * clutter/src/behaviour.hg:
    * clutter/src/box.ccg:
    * clutter/src/box.hg:
    * clutter/src/clone-texture.ccg:
    * clutter/src/clone-texture.hg:
    * clutter/src/clutter.defs:
    * clutter/src/clutter_docs.xml:
    * clutter/src/clutter_docs_override.xml:
    * clutter/src/clutter_enums.defs:
    * clutter/src/clutter_methods.defs:
    * clutter/src/clutter_others.defs:
    * clutter/src/clutter_signals.defs:
    * clutter/src/clutter_vfuncs.defs:
    * clutter/src/color.ccg:
    * clutter/src/color.hg:
    * clutter/src/container.ccg:
    * clutter/src/container.hg:
    * clutter/src/effecttemplate.ccg:
    * clutter/src/effecttemplate.hg:
    * clutter/src/entry.ccg:
    * clutter/src/entry.hg:
    * clutter/src/group.ccg:
    * clutter/src/group.hg:
    * clutter/src/label.ccg:
    * clutter/src/label.hg:
    * clutter/src/layout.ccg:
    * clutter/src/layout.hg:
    * clutter/src/margin.ccg:
    * clutter/src/margin.hg:
    * clutter/src/media.ccg:
    * clutter/src/media.hg:
    * clutter/src/rectangle.ccg:
    * clutter/src/rectangle.hg:
    * clutter/src/score.ccg:
    * clutter/src/score.hg:
    * clutter/src/script.ccg:
    * clutter/src/script.hg:
    * clutter/src/scriptable.ccg:
    * clutter/src/scriptable.hg:
    * clutter/src/shader.ccg:
    * clutter/src/shader.hg:
    * clutter/src/stage.ccg:
    * clutter/src/stage.hg:
    * clutter/src/texture.ccg:
    * clutter/src/texture.hg:
    * clutter/src/timeline.ccg:
    * clutter/src/timeline.hg:
    * clutter/src/timeout-pool.ccg:
    * clutter/src/timeout-pool.hg:
    * clutter/src/types.ccg:
    * clutter/src/types.hg:
    * clutter/src/types.ccg:
    * clutter/src/types.hg:
    * configure.in:
    * docs/reference/Doxyfile.in:
    * docs/reference/Makefile.am:
    * examples/Makefile.am:
    * examples/Makefile.am_fragment:
    * examples/effect.cc:
    * examples/embed-gtk.cc:
    * examples/flowers.cc:
    * examples/simple-cairo.cc:
    * examples/test-actors.cc:
    * examples/test-boxes.cc:
    * scripts/ltmain.sh:
    * tools/extra_defs_gen/Makefile.am:
    * tools/extra_defs_gen/generate_defs_clutter.cc:
    * tools/extra_defs_gen/generate_defs_clutter_cairo.cc:
    * tools/extra_defs_gen/generate_defs_clutter_gtk.cc: Updated the sources
    to use clutter-gtkmm, removed all cluttermm and clutter-cairomm stuff and
    some small fixes.


Added:
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/
      - copied from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm-config.h.in
      - copied unchanged from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk-config.h.in
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h
      - copied, changed from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.h
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.pc.in
      - copied, changed from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.pc.in
   clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
      - copied, changed from r1620, /clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
Removed:
   clutter-gtkmm/trunk/clutter/
   clutter-gtkmm/trunk/clutter-cairo/
   clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/
   clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk-config.h.in
   clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.h
   clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.pc.in
   clutter-gtkmm/trunk/examples/effect.cc
   clutter-gtkmm/trunk/examples/flowers.cc
   clutter-gtkmm/trunk/examples/simple-cairo.cc
   clutter-gtkmm/trunk/examples/test-actors.cc
   clutter-gtkmm/trunk/examples/test-boxes.cc
   clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
   clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
Modified:
   clutter-gtkmm/trunk/ChangeLog
   clutter-gtkmm/trunk/autogen.sh
   clutter-gtkmm/trunk/clutter-gtk/Makefile.am
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/Makefile.am
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.cc
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.h
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/private/Makefile.am
   clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h
   clutter-gtkmm/trunk/clutter-gtk/src/Makefile.am
   clutter-gtkmm/trunk/clutter-gtk/src/embed.hg
   clutter-gtkmm/trunk/configure.in
   clutter-gtkmm/trunk/docs/reference/Doxyfile.in
   clutter-gtkmm/trunk/docs/reference/Makefile.am
   clutter-gtkmm/trunk/examples/Makefile.am
   clutter-gtkmm/trunk/examples/Makefile.am_fragment
   clutter-gtkmm/trunk/examples/embed-gtk.cc
   clutter-gtkmm/trunk/scripts/ltmain.sh
   clutter-gtkmm/trunk/tools/extra_defs_gen/Makefile.am

Modified: clutter-gtkmm/trunk/autogen.sh
==============================================================================
--- clutter-gtkmm/trunk/autogen.sh	(original)
+++ clutter-gtkmm/trunk/autogen.sh	Wed Jul 23 19:01:09 2008
@@ -15,11 +15,11 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="cluttermm"
+PKG_NAME="clutter-gtkmm"
 
 (test -f $srcdir/configure.in \
-  && test -d $srcdir/clutter/src \
-  && test -d $srcdir/clutter/cluttermm) || {
+  && test -d $srcdir/clutter-gtk/src \
+  && test -d $srcdir/clutter-gtk/clutter-gtkmm) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: clutter-gtkmm/trunk/clutter-gtk/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/Makefile.am	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -1,17 +1,17 @@
-SUBDIRS		= src cluttermm-gtk
+SUBDIRS		= src clutter-gtkmm
 
 EXTRA_DIST	= README					\
-		  cluttermm-gtk-config.h.in cluttermm-gtk.h	\
-		  cluttermm-gtk.pc.in
+		  clutter-gtkmm-config.h.in clutter-gtkmm.h	\
+		  clutter-gtkmm.pc.in
 
-cluttermm_includedir		= $(includedir)/cluttermm-gtk-$(API_VER)
-cluttermm_include_HEADERS	= cluttermm-gtk.h
+clutter_gtkmm_includedir		= $(includedir)/clutter-gtkmm-$(API_VER)
+clutter_gtkmm_include_HEADERS	= clutter-gtkmm.h
 
-cluttermm_configdir		= $(libdir)/cluttermm-gtk-$(API_VER)/include
-cluttermm_config_DATA	= cluttermm-gtk-config.h
+clutter_gtkmm_configdir		= $(libdir)/clutter-gtkmm-$(API_VER)/include
+clutter_gtkmm_config_DATA	= clutter-gtkmm-config.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= cluttermm-gtk-$(API_VER).pc
+pkgconfig_DATA		= clutter-gtkmm-$(API_VER).pc
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 

Copied: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h (from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.h)
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.h	Wed Jul 23 19:01:09 2008
@@ -17,16 +17,16 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef LIBCLUTTERMM_GTK_H
-#define LIBCLUTTERMM_GTK_H
+#ifndef LIBCLUTTER_GTKMM_H
+#define LIBCLUTTER_GTKMM_H
 
 /* cluttermm version.  */
-extern const int cluttermm_major_version;
-extern const int cluttermm_minor_version;
-extern const int cluttermm_micro_version;
+extern const int clutter_gtkmm_major_version;
+extern const int clutter_gtkmm_minor_version;
+extern const int clutter_gtkmm_micro_version;
 
 #include <cluttermm.h>
-#include <cluttermm-gtk/init.h>
-#include <cluttermm-gtk/embed.h>
+#include <clutter-gtkmm/init.h>
+#include <clutter-gtkmm/embed.h>
 
-#endif /* #ifndef LIBCLUTTERMM_GTK_H */
+#endif /* #ifndef LIBCLUTTER_GTKMM_H */

Copied: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.pc.in (from r1620, /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.pc.in)
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk.pc.in	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm.pc.in	Wed Jul 23 19:01:09 2008
@@ -3,9 +3,9 @@
 libdir= libdir@
 includedir= includedir@
 
-Name: cluttermm-gtk
+Name: clutter-gtkmm
 Description: C++ wrapper for clutter
-Requires: clutter-0.6 cluttermm- API_VER@ gtkmm-2.4
+Requires: clutter-gtk- API_VER@ cluttermm- API_VER@ gtkmm-2.4
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-gtk- API_VER@
-Cflags: -I${includedir}/cluttermm-gtk- API_VER@
+Libs: -L${libdir} -lclutter-gtkmm- API_VER@
+Cflags: -I${includedir}/clutter-gtkmm- API_VER@

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/Makefile.am
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/Makefile.am	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -3,11 +3,11 @@
 
 SUBDIRS = private
 
-sublib_name = cluttermm-gtk
-sublib_libname = cluttermm-gtk-$(API_VER)
-sublib_libversion = $(CLUTTERMM_SO_VERSION)
+sublib_name = clutter-gtkmm
+sublib_libname = clutter-gtkmm-$(API_VER)
+sublib_libversion = $(CLUTTER_GTKMM_SO_VERSION)
 sublib_namespace = Clutter
-sublib_cflags = $(CLUTTERMM_GTK_CFLAGS) -I$(top_srcdir)/clutter
+sublib_cflags = $(CLUTTER_GTKMM_CFLAGS)
 sublib_topdir = clutter-gtk
 
 files_extra_h = wrap_init.h init.h
@@ -15,9 +15,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES = libcluttermm-gtk- API_VER@.la
-libcluttermm_gtk_ API_VER@_la_SOURCES = $(files_all_cc)
-libcluttermm_gtk_ API_VER@_la_LDFLAGS = $(common_ldflags)
-libcluttermm_gtk_ API_VER@_la_LIBADD = $(CLUTTERMM_GTK_LIBS) \
-	$(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la
+lib_LTLIBRARIES = libclutter-gtkmm- API_VER@.la
+libclutter_gtkmm_ API_VER@_la_SOURCES = $(files_all_cc)
+libclutter_gtkmm_ API_VER@_la_LDFLAGS = $(common_ldflags)
+libclutter_gtkmm_ API_VER@_la_LIBADD = $(CLUTTER_GTKMM_LIBS)
 

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.cc
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/init.cc	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.cc	Wed Jul 23 19:01:09 2008
@@ -17,8 +17,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <cluttermm-gtk-config.h> //For LIBCLUTTERMM_VERSION
-#include <cluttermm-gtk/wrap_init.h>
+#include <clutter-gtkmm-config.h> //For LIBCLUTTERMM_VERSION
+#include <clutter-gtkmm/wrap_init.h>
 #include <cluttermm/init.h>
 
 namespace Clutter
@@ -29,7 +29,7 @@
 void init(int* nargs, gchar **args[])
 {
   Clutter::init (nargs, args);
-  wrap_init (); //Tells the Glib::wrap() table about the libcluttermm-gtk classes.
+  wrap_init (); //Tells the Glib::wrap() table about the libclutter-gtkmm classes.
 }
 
 } //namespace Gtk

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.h
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/init.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/init.h	Wed Jul 23 19:01:09 2008
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef _LIBCLUTTERMM_GTK_INIT_H
-#define _LIBCLUTTERMM_GTK_INIT_H
+#ifndef _LIBCLUTTER_GTKMM_INIT_H
+#define _LIBCLUTTER_GTKMM_INIT_H
 /*
  * Copyright 2008 Jonathon Jongsma
  *
@@ -31,5 +31,5 @@
 } //namespace Gtk
 } //namespace Clutter
 
-#endif //_LIBCLUTTERMM_GTK_INIT_H
+#endif //_LIBCLUTTER_GTKMM_INIT_H
 

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/private/Makefile.am
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/private/Makefile.am	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/private/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -4,7 +4,7 @@
 include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
 files_built_h		= $(files_hg:.hg=_p.h)
 
-private_includedir	= ${includedir}/cluttermm-gtk-$(API_VER)/cluttermm-gtk/private
+private_includedir	= ${includedir}/clutter-gtkmm-$(API_VER)/clutter-gtkmm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h
==============================================================================
--- /clutter-gtkmm/trunk/clutter-gtk/cluttermm-gtk/wrap_init.h	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h	Wed Jul 23 19:01:09 2008
@@ -1,5 +1,5 @@
-#ifndef _LIBCLUTTERMM_WRAP_INIT_H
-#define _LIBCLUTTERMM_WRAP_INIT_H
+#ifndef _LIBCLUTTER_GTKMM_WRAP_INIT_H
+#define _LIBCLUTTER_GTKMM_WRAP_INIT_H
 
 /* wrap_init.h
  *
@@ -29,4 +29,4 @@
 
 } //namespace Clutter
 
-#endif // _LIBCLUTTERMM_WRAP_INIT_H
+#endif // _LIBCLUTTER_GTKMM_WRAP_INIT_H

Modified: clutter-gtkmm/trunk/clutter-gtk/src/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/src/Makefile.am	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -1,10 +1,10 @@
 ## Copyright (c) 2001
 ## The cluttermm development team.
 
-sublib_name	= cluttermm-gtk
+sublib_name	= clutter-gtkmm
 #nested namespaces separated with spaces
 sublib_namespace = Clutter Gtk
-sublib_parentdir = cluttermm-gtk
+sublib_parentdir = clutter-gtkmm
 files_defs	= clutter-gtk.defs \
 			  clutter-gtk_methods.defs \
 			  clutter-gtk_signals.defs \

Modified: clutter-gtkmm/trunk/clutter-gtk/src/embed.hg
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/src/embed.hg	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/embed.hg	Wed Jul 23 19:01:09 2008
@@ -18,7 +18,7 @@
 #include <cluttermm/stage.h>
 #include <gtkmm/widget.h>
  
-_DEFS(cluttermm-gtk,clutter-gtk)
+_DEFS(clutter-gtkmm,clutter-gtk)
 _PINCLUDE(cluttermm/private/stage_p.h)
 _PINCLUDE(gtkmm/private/widget_p.h)
 

Modified: clutter-gtkmm/trunk/configure.in
==============================================================================
--- clutter-gtkmm/trunk/configure.in	(original)
+++ clutter-gtkmm/trunk/configure.in	Wed Jul 23 19:01:09 2008
@@ -1,11 +1,11 @@
-AC_INIT(clutter/cluttermmconfig.h.in)
+AC_INIT(clutter-gtk/clutter-gtkmm-config.h.in)
 
 #########################################################################
 #  Version and initialization
 #########################################################################
-CLUTTERMM_MAJOR_VERSION=0
-CLUTTERMM_MINOR_VERSION=7
-CLUTTERMM_MICRO_VERSION=1
+CLUTTER_GTKMM_MAJOR_VERSION=0
+CLUTTER_GTKMM_MINOR_VERSION=7
+CLUTTER_GTKMM_MICRO_VERSION=1
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -14,31 +14,29 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 #                 better
 # CURRENT : REVISION : AGE
-CLUTTERMM_SO_VERSION=1:0:0
+CLUTTER_GTKMM_SO_VERSION=1:0:0
 
-CLUTTERMM_VERSION=$CLUTTERMM_MAJOR_VERSION.$CLUTTERMM_MINOR_VERSION.$CLUTTERMM_MICRO_VERSION
-CLUTTERMM_RELEASE=$CLUTTERMM_MAJOR_VERSION.$CLUTTERMM_MINOR_VERSION
-AC_DEFINE_UNQUOTED([CLUTTERMM_MAJOR_VERSION], $CLUTTERMM_MAJOR_VERSION, major version)
-AC_DEFINE_UNQUOTED([CLUTTERMM_MINOR_VERSION], $CLUTTERMM_MINOR_VERSION, minor version)
-AC_DEFINE_UNQUOTED([CLUTTERMM_MICRO_VERSION], $CLUTTERMM_MICRO_VERSION, micro version)
-AC_DEFINE_UNQUOTED([CLUTTERMM_VERSION], "$CLUTTERMM_VERSION", cluttermm version string)
-AC_SUBST(CLUTTERMM_VERSION)
-AC_SUBST(CLUTTERMM_RELEASE)
-AC_SUBST(CLUTTERMM_SO_VERSION)
+CLUTTER_GTKMM_VERSION=$CLUTTER_GTKMM_MAJOR_VERSION.$CLUTTER_GTKMM_MINOR_VERSION.$CLUTTER_GTKMM_MICRO_VERSION
+CLUTTER_GTKMM_RELEASE=$CLUTTER_GTKMM_MAJOR_VERSION.$CLUTTER_GTKMM_MINOR_VERSION
+AC_DEFINE_UNQUOTED([CLUTTER_GTKMM_MAJOR_VERSION], $CLUTTER_GTKMM_MAJOR_VERSION, major version)
+AC_DEFINE_UNQUOTED([CLUTTER_GTKMM_MINOR_VERSION], $CLUTTER_GTKMM_MINOR_VERSION, minor version)
+AC_DEFINE_UNQUOTED([CLUTTER_GTKMM_MICRO_VERSION], $CLUTTER_GTKMM_MICRO_VERSION, micro version)
+AC_DEFINE_UNQUOTED([CLUTTER_GTKMM_VERSION], "$CLUTTER_GTKMM_VERSION", clutter-gtkmm version string)
+AC_SUBST(CLUTTER_GTKMM_VERSION)
+AC_SUBST(CLUTTER_GTKMM_RELEASE)
+AC_SUBST(CLUTTER_GTKMM_SO_VERSION)
 
 AC_CONFIG_AUX_DIR(scripts)
 
 dnl For automake.
-VERSION=$CLUTTERMM_VERSION
-PACKAGE=cluttermm
+VERSION=$CLUTTER_GTKMM_VERSION
+PACKAGE=clutter-gtkmm
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 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_CONFIG_HEADER(clutter-gtk/clutter-gtkmm-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -58,14 +56,14 @@
 AM_PROG_LIBTOOL
 
 AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
-SUN m4 does not work for building cluttermm.
+SUN m4 does not work for building clutter-gtkmm.
 Please install GNU m4.]))
 
 AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
-SUN make does not work for building cluttermm.
+SUN make does not work for building clutter-gtkmm.
 Please install GNU make.]))
 
-AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build cluttermm.]))
+AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build clutter-gtkmm.]))
 
 AC_CHECK_PROGS(PERL, perl5 perl)
 
@@ -73,11 +71,12 @@
 #  Dependancy checks
 #########################################################################
 
-PKG_CHECK_MODULES(CLUTTERMM_GTK,
+PKG_CHECK_MODULES(CLUTTER_GTKMM,
                   [gtkmm-2.4
+				   cluttermm-0.8
                    clutter-gtk-0.8])
-AC_SUBST(CLUTTERMM_GTK_CFLAGS)
-AC_SUBST(CLUTTERMM_GTK_LIBS)
+AC_SUBST(CLUTTER_GTKMM_CFLAGS)
+AC_SUBST(CLUTTER_GTKMM_LIBS)
 
 # the API version of the library.  Libraries and pkg-config files will have this
 # value appended to them, e.g. libclutter-0.6.so
@@ -105,10 +104,10 @@
   Makefile
 
   clutter-gtk/Makefile
-  clutter-gtk/cluttermm-gtk-$API_VER.pc:clutter-gtk/cluttermm-gtk.pc.in
+  clutter-gtk/clutter-gtkmm-$API_VER.pc:clutter-gtk/clutter-gtkmm.pc.in
   clutter-gtk/src/Makefile
-  clutter-gtk/cluttermm-gtk/Makefile
-  clutter-gtk/cluttermm-gtk/private/Makefile
+  clutter-gtk/clutter-gtkmm/Makefile
+  clutter-gtk/clutter-gtkmm/private/Makefile
 
   tools/Makefile
     tools/extra_defs_gen/Makefile

Modified: clutter-gtkmm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- clutter-gtkmm/trunk/docs/reference/Doxyfile.in	(original)
+++ clutter-gtkmm/trunk/docs/reference/Doxyfile.in	Wed Jul 23 19:01:09 2008
@@ -4,8 +4,8 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = cluttermm
-PROJECT_NUMBER         = @CLUTTERMM_VERSION@
+PROJECT_NAME           = clutter-gtkmm
+PROJECT_NUMBER         = @CLUTTER_GTKMM_VERSION@
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -75,7 +75,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @top_builddir@/clutter/cluttermm @top_builddir@/clutter-cairo/cluttermm-cairo
+INPUT                  = @top_builddir@/clutter-gtk/clutter-gtkmm
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = NO

Modified: clutter-gtkmm/trunk/docs/reference/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/docs/reference/Makefile.am	(original)
+++ clutter-gtkmm/trunk/docs/reference/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -5,23 +5,23 @@
 EXTRA_DIST	= README $(doxygen_configfile)
 
 
-cluttermm-reference: $(doxygen_configfile)
+clutter-gtkmm-reference: $(doxygen_configfile)
 	doxygen $(doxygen_configfile)
 
-cluttermm-reference-html: cluttermm-reference
+clutter-gtkmm-reference-html: clutter-gtkmm-reference
 
-cluttermm-reference-html.tar.gz: cluttermm-reference-html
+clutter-gtkmm-reference-html.tar.gz: clutter-gtkmm-reference-html
 	tar -cf - $< | gzip > $@
 
 
-post-html: cluttermm-reference
+post-html: clutter-gtkmm-reference
 	(cd html && tar -cf - *.html *.gif *.css | gzip -3 | \
 	 ssh $$SSH_OPT $$USER gtkmm sourceforge net "cd $(web_path_reference)/html ; gunzip | tar -xvf - ; chmod a+r,g+w * ; chgrp gtkmm *")
 
 
-all-local: cluttermm-reference
+all-local: clutter-gtkmm-reference
 
 clean-local:
 	-rm -rf html
-	-rm -f cluttermm-reference-html.tar.gz
+	-rm -f clutter-gtkmm-reference-html.tar.gz
 

Modified: clutter-gtkmm/trunk/examples/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/examples/Makefile.am	(original)
+++ clutter-gtkmm/trunk/examples/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -2,13 +2,8 @@
 
 include Makefile.am_fragment
 
-noinst_PROGRAMS = actors flowers simple-cairo embed-gtk effect
-actors_SOURCES = test-actors.cc
-flowers_SOURCES = flowers.cc
-simple_cairo_SOURCES = simple-cairo.cc
+noinst_PROGRAMS = embed-gtk
 embed_gtk_SOURCES = embed-gtk.cc
-effect_SOURCES = effect.cc
-#boxes_SOURCES = test-boxes.cc
 
 EXTRA_DIST = actor.png
 

Modified: clutter-gtkmm/trunk/examples/Makefile.am_fragment
==============================================================================
--- clutter-gtkmm/trunk/examples/Makefile.am_fragment	(original)
+++ clutter-gtkmm/trunk/examples/Makefile.am_fragment	Wed Jul 23 19:01:09 2008
@@ -1,13 +1,9 @@
-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
+local_clutter_gtkmm_libs = $(top_builddir)/clutter-gtk/clutter-gtkmm/libclutter-gtkmm-$(API_VER).la
 
-LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(CLUTTERMM_GTK_LIBS) $(local_cluttermm_libs) 
+LIBS  = $(CLUTTER_GTKMM_LIBS) $(local_clutter_gtkmm_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)
+all_includes = -I$(top_srcdir)/clutter-gtk \
+               $(CLUTTER_GTKMM_CFLAGS)
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =

Modified: clutter-gtkmm/trunk/examples/embed-gtk.cc
==============================================================================
--- clutter-gtkmm/trunk/examples/embed-gtk.cc	(original)
+++ clutter-gtkmm/trunk/examples/embed-gtk.cc	Wed Jul 23 19:01:09 2008
@@ -1,5 +1,5 @@
 #include <gtkmm.h>
-#include <cluttermm-gtk.h>
+#include <clutter-gtkmm.h>
 
 Glib::RefPtr<Clutter::Label> label;
 Gtk::Entry *pentry;

Modified: clutter-gtkmm/trunk/scripts/ltmain.sh
==============================================================================
--- clutter-gtkmm/trunk/scripts/ltmain.sh	(original)
+++ clutter-gtkmm/trunk/scripts/ltmain.sh	Wed Jul 23 19:01:09 2008
@@ -1 +1 @@
-link /opt/gnome220/share/libtool/ltmain.sh
\ No newline at end of file
+link /usr/share/libtool/ltmain.sh
\ No newline at end of file

Modified: clutter-gtkmm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ clutter-gtkmm/trunk/tools/extra_defs_gen/Makefile.am	Wed Jul 23 19:01:09 2008
@@ -3,11 +3,8 @@
 
 LIBS = -lglibmm_generate_extra_defs-2.4
 
-noinst_PROGRAMS = generate_extra_defs_clutter generate_extra_defs_clutter_cairo
-generate_extra_defs_clutter_SOURCES = generate_defs_clutter.cc
-generate_extra_defs_clutter_cairo_SOURCES = generate_defs_clutter_cairo.cc
+noinst_PROGRAMS = generate_extra_defs_clutter_gtk
+generate_extra_defs_clutter_gtk_SOURCES = generate_defs_clutter_gtk.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)
+generate_extra_defs_clutter_gtk_CXXFLAGS = $(CLUTTER_GTKMM_CFLAGS)
+generate_extra_defs_clutter_gtk_LDADD = $(CLUTTER_GTKMM_LIBS)

Copied: clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc (from r1620, /clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc)
==============================================================================
--- /clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc	(original)
+++ clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc	Wed Jul 23 19:01:09 2008
@@ -17,7 +17,7 @@
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <clutter/clutter.h>
-#include <clutter-cairo/clutter-cairo.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 #include <iostream>
 
 
@@ -26,7 +26,7 @@
   clutter_init(&argc, &argv) ;
 
   std::cout 
-    << get_defs(CLUTTER_TYPE_CAIRO)
+    << get_defs(GTK_TYPE_CLUTTER_EMBED)
     ;
 
   return 0;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]