gnomemm r1619 - in clutter-cairomm/trunk: . clutter-cairo clutter-cairo/clutter-cairomm clutter-cairo/clutter-cairomm/private clutter-cairo/cluttermm-cairo clutter-cairo/src docs/reference examples tools/extra_defs_gen

From: siavashs svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r1619 - in clutter-cairomm/trunk: . clutter-cairo clutter-cairo/clutter-cairomm clutter-cairo/clutter-cairomm/private clutter-cairo/cluttermm-cairo clutter-cairo/src docs/reference examples tools/extra_defs_gen
Date: Tue, 22 Jul 2008 20:51:25 +0000 (UTC)
Author: siavashs
Date: Tue Jul 22 20:51:24 2008
New Revision: 1619
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1619&view=rev

Log:
Renamed and modified all sources to use clutter-cairomm

    * autogen.sh:
    * clutter-cairo/Makefile.am:
    * clutter-cairo/clutter-cairomm.h:
    * clutter-cairo/clutter-cairomm.pc.in:
    * clutter-cairo/clutter-cairomm/Makefile.am:
    * clutter-cairo/clutter-cairomm/init.cc:
    * clutter-cairo/clutter-cairomm/private/Makefile.am:
    * 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/cairo-texture.hg:
    * configure.in:
    * docs/reference/Doxyfile.in:
    * docs/reference/Makefile.am:
    * examples/Makefile.am_fragment:
    * examples/flowers.cc:
    * examples/simple-cairo.cc:
    * tools/extra_defs_gen/Makefile.am:
    * tools/extra_defs_gen/generate_defs_clutter.cc: Renamed and modified all
    sources to use clutter-cairomm, remove all remaining cluttermm stuff and
    many other fixes.


Added:
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/
      - copied from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo/
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in
      - copied unchanged from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo-config.h.in
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.h
      - copied, changed from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.h
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in
      - copied, changed from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.pc.in
Removed:
   clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo/
   clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo-config.h.in
   clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.h
   clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.pc.in
   clutter-cairomm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
Modified:
   clutter-cairomm/trunk/ChangeLog
   clutter-cairomm/trunk/autogen.sh
   clutter-cairomm/trunk/clutter-cairo/Makefile.am
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/Makefile.am
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/private/Makefile.am
   clutter-cairomm/trunk/clutter-cairo/src/Makefile.am
   clutter-cairomm/trunk/clutter-cairo/src/cairo-texture.hg
   clutter-cairomm/trunk/configure.in
   clutter-cairomm/trunk/docs/reference/Doxyfile.in
   clutter-cairomm/trunk/docs/reference/Makefile.am
   clutter-cairomm/trunk/examples/Makefile.am_fragment
   clutter-cairomm/trunk/examples/flowers.cc
   clutter-cairomm/trunk/examples/simple-cairo.cc
   clutter-cairomm/trunk/tools/extra_defs_gen/Makefile.am

Modified: clutter-cairomm/trunk/autogen.sh
==============================================================================
--- clutter-cairomm/trunk/autogen.sh	(original)
+++ clutter-cairomm/trunk/autogen.sh	Tue Jul 22 20:51:24 2008
@@ -15,11 +15,11 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="cluttermm"
+PKG_NAME="clutter-cairomm"
 
 (test -f $srcdir/configure.in \
-  && test -d $srcdir/clutter/src \
-  && test -d $srcdir/clutter/cluttermm) || {
+  && test -d $srcdir/clutter-cairo/src \
+  && test -d $srcdir/clutter-cairo/clutter-cairomm) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: clutter-cairomm/trunk/clutter-cairo/Makefile.am
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/Makefile.am	(original)
+++ clutter-cairomm/trunk/clutter-cairo/Makefile.am	Tue Jul 22 20:51:24 2008
@@ -1,15 +1,15 @@
-SUBDIRS		= src cluttermm-cairo
+SUBDIRS		= src clutter-cairomm
 
 EXTRA_DIST	= README					\
-		  cluttermm-cairo-config.h.in cluttermm-cairo.h	\
-		  cluttermm-cairo.pc.in
+		  clutter-cairomm-config.h.in clutter-cairomm.h	\
+		  clutter-cairomm.pc.in
 
-cluttermm_includedir		= $(includedir)/cluttermm-cairo-$(API_VER)
-cluttermm_include_HEADERS	= cluttermm-cairo.h
+cluttermm_includedir		= $(includedir)/clutter-cairomm-$(API_VER)
+cluttermm_include_HEADERS	= clutter-cairomm.h
 
-cluttermm_configdir		= $(libdir)/cluttermm-cairo-$(API_VER)/include
-cluttermm_config_DATA	= cluttermm-cairo-config.h
+cluttermm_configdir		= $(libdir)/clutter-cairomm-$(API_VER)/include
+cluttermm_config_DATA	= clutter-cairomm-config.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= cluttermm-cairo-$(API_VER).pc
+pkgconfig_DATA		= clutter-cairomm-$(API_VER).pc
 DISTCLEANFILES = $(pkgconfig_DATA)

Copied: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.h (from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.h)
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.h	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.h	Tue Jul 22 20:51:24 2008
@@ -26,7 +26,7 @@
 extern const int cluttermm_micro_version;
 
 #include <cluttermm.h>
-#include <cluttermm-cairo/init.h>
-#include <cluttermm-cairo/cairo-texture.h>
+#include <clutter-cairomm/init.h>
+#include <clutter-cairomm/cairo-texture.h>
 
 #endif /* #ifndef LIBCLUTTERMM_CAIRO_H */

Copied: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in (from r1617, /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.pc.in)
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo.pc.in	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in	Tue Jul 22 20:51:24 2008
@@ -3,9 +3,9 @@
 libdir= libdir@
 includedir= includedir@
 
-Name: cluttermm-cairo
+Name: clutter-cairomm
 Description: C++ wrapper for clutter
-Requires: clutter-0.6 cluttermm- API_VER@ cairomm-1.0
+Requires: clutter- API_VER@ cluttermm- API_VER@ cairomm-1.0
 Version: @VERSION@
 Libs: -L${libdir} -lcluttermm-cairo- API_VER@
-Cflags: -I${includedir}/cluttermm-cairo- API_VER@
+Cflags: -I${includedir}/clutter-cairomm- API_VER@

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/Makefile.am
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/Makefile.am	Tue Jul 22 20:51:24 2008
@@ -3,11 +3,11 @@
 
 SUBDIRS = private
 
-sublib_name = cluttermm-cairo
-sublib_libname = cluttermm-cairo-$(API_VER)
-sublib_libversion = $(CLUTTERMM_SO_VERSION)
+sublib_name = clutter-cairomm
+sublib_libname = clutter-cairomm-$(API_VER)
+sublib_libversion = $(CLUTTER_CAIROMM_SO_VERSION)
 sublib_namespace = Clutter
-sublib_cflags = $(CLUTTERMM_CAIRO_CFLAGS) -I$(top_srcdir)/clutter
+sublib_cflags = $(CLUTTER_CAIROMM_CFLAGS) -I$(top_srcdir)/clutter
 sublib_topdir = clutter-cairo
 
 
@@ -16,9 +16,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES = libcluttermm-cairo- API_VER@.la
-libcluttermm_cairo_ API_VER@_la_SOURCES = $(files_all_cc)
-libcluttermm_cairo_ API_VER@_la_LDFLAGS = $(common_ldflags)
-libcluttermm_cairo_ API_VER@_la_LIBADD = $(CLUTTERMM_CAIRO_LIBS) \
-	$(top_builddir)/clutter/cluttermm/libcluttermm-$(API_VER).la
+lib_LTLIBRARIES = libclutter-cairomm- API_VER@.la
+libclutter_cairomm_ API_VER@_la_SOURCES = $(files_all_cc)
+libclutter_cairomm_ API_VER@_la_LDFLAGS = $(common_ldflags)
+libclutter_cairomm_ API_VER@_la_LIBADD = $(CLUTTER_CAIROMM_LIBS)
 

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo/init.cc	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc	Tue Jul 22 20:51:24 2008
@@ -17,8 +17,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <cluttermm-cairo-config.h> //For LIBCLUTTERMM_VERSION
-#include <cluttermm-cairo/wrap_init.h>
+#include <clutter-cairomm-config.h> //For LIBCLUTTERMM_VERSION
+#include <clutter-cairomm/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-cairo classes.
+  wrap_init (); //Tells the Glib::wrap() table about the libclutter-cairomm classes.
 }
 
 } //namespace Cairo

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/private/Makefile.am
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/cluttermm-cairo/private/Makefile.am	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/private/Makefile.am	Tue Jul 22 20:51:24 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-cairo-$(API_VER)/cluttermm-cairo/private
+private_includedir	= ${includedir}/clutter-cairomm-$(API_VER)/clutter-cairomm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Modified: clutter-cairomm/trunk/clutter-cairo/src/Makefile.am
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/src/Makefile.am	(original)
+++ clutter-cairomm/trunk/clutter-cairo/src/Makefile.am	Tue Jul 22 20:51:24 2008
@@ -1,10 +1,10 @@
 ## Copyright (c) 2001
 ## The cluttermm development team.
 
-sublib_name	= cluttermm-cairo
+sublib_name	= clutter-cairomm
 #nested namespaces separated with spaces
 sublib_namespace = Clutter Cairo
-sublib_parentdir = cluttermm-cairo
+sublib_parentdir = clutter-cairomm
 files_defs	= clutter-cairo.defs \
 			  clutter-cairo_methods.defs \
 			  clutter-cairo_signals.defs \

Modified: clutter-cairomm/trunk/clutter-cairo/src/cairo-texture.hg
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/src/cairo-texture.hg	(original)
+++ clutter-cairomm/trunk/clutter-cairo/src/cairo-texture.hg	Tue Jul 22 20:51:24 2008
@@ -18,7 +18,7 @@
 #include <cluttermm/texture.h>
 #include <cairomm/context.h>
  
-_DEFS(cluttermm-cairo,clutter-cairo)
+_DEFS(clutter-cairomm,clutter-cairo)
 _PINCLUDE(cluttermm/private/texture_p.h)
 
 

Modified: clutter-cairomm/trunk/configure.in
==============================================================================
--- clutter-cairomm/trunk/configure.in	(original)
+++ clutter-cairomm/trunk/configure.in	Tue Jul 22 20:51:24 2008
@@ -1,11 +1,11 @@
-AC_INIT(clutter/cluttermmconfig.h.in)
+AC_INIT(clutter-cairo/clutter-cairomm-config.h.in)
 
 #########################################################################
 #  Version and initialization
 #########################################################################
-CLUTTERMM_MAJOR_VERSION=0
-CLUTTERMM_MINOR_VERSION=7
-CLUTTERMM_MICRO_VERSION=1
+CLUTTER_CAIROMM_MAJOR_VERSION=0
+CLUTTER_CAIROMM_MINOR_VERSION=7
+CLUTTER_CAIROMM_MICRO_VERSION=1
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -14,29 +14,29 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 #                 better
 # CURRENT : REVISION : AGE
-CLUTTERMM_SO_VERSION=1:0:0
+CLUTTER_CAIROMM_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_CAIROMM_VERSION=$CLUTTER_CAIROMM_MAJOR_VERSION.$CLUTTER_CAIROMM_MINOR_VERSION.$CLUTTER_CAIROMM_MICRO_VERSION
+CLUTTER_CAIROMM_RELEASE=$CLUTTER_CAIROMM_MAJOR_VERSION.$CLUTTER_CAIROMM_MINOR_VERSION
+AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MAJOR_VERSION], $CLUTTER_CAIROMM_MAJOR_VERSION, major version)
+AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MINOR_VERSION], $CLUTTER_CAIROMM_MINOR_VERSION, minor version)
+AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MICRO_VERSION], $CLUTTER_CAIROMM_MICRO_VERSION, micro version)
+AC_DEFINE_UNQUOTED([CLUTTERMM_VERSION], "$CLUTTER_CAIROMM_VERSION", clutter-cairomm version string)
+AC_SUBST(CLUTTER_CAIROMM_VERSION)
+AC_SUBST(CLUTTER_CAIROMM_RELEASE)
+AC_SUBST(CLUTTER_CAIROMM_SO_VERSION)
 
 AC_CONFIG_AUX_DIR(scripts)
 
 dnl For automake.
-VERSION=$CLUTTERMM_VERSION
-PACKAGE=cluttermm
+VERSION=$CLUTTER_CAIROMM_VERSION
+PACKAGE=clutter-cairomm
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl Specify a configuration file (no autoheader)
-AM_CONFIG_HEADER(clutter-cairo/cluttermm-cairo-config.h)
+AM_CONFIG_HEADER(clutter-cairo/clutter-cairomm-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -71,8 +71,9 @@
 #  Dependancy checks
 #########################################################################
 
-PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
-                  [clutter-cairo-0.8
+PKG_CHECK_MODULES(CLUTTER_CAIROMM,
+                  [cluttermm-0.8
+				   clutter-cairo-0.8
                    cairomm-1.0])
 
 
@@ -102,10 +103,10 @@
   Makefile
 
   clutter-cairo/Makefile
-  clutter-cairo/cluttermm-cairo-$API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
+  clutter-cairo/clutter-cairomm-$API_VER.pc:clutter-cairo/clutter-cairomm.pc.in
   clutter-cairo/src/Makefile
-  clutter-cairo/cluttermm-cairo/Makefile
-  clutter-cairo/cluttermm-cairo/private/Makefile
+  clutter-cairo/clutter-cairomm/Makefile
+  clutter-cairo/clutter-cairomm/private/Makefile
 
   tools/Makefile
     tools/extra_defs_gen/Makefile

Modified: clutter-cairomm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- clutter-cairomm/trunk/docs/reference/Doxyfile.in	(original)
+++ clutter-cairomm/trunk/docs/reference/Doxyfile.in	Tue Jul 22 20:51:24 2008
@@ -4,8 +4,8 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = cluttermm
-PROJECT_NUMBER         = @CLUTTERMM_VERSION@
+PROJECT_NAME           = clutter-cairomm
+PROJECT_NUMBER         = @CLUTTER_CAIROMM_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-cairo/clutter-cairomm
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = NO

Modified: clutter-cairomm/trunk/docs/reference/Makefile.am
==============================================================================
--- clutter-cairomm/trunk/docs/reference/Makefile.am	(original)
+++ clutter-cairomm/trunk/docs/reference/Makefile.am	Tue Jul 22 20:51:24 2008
@@ -5,23 +5,23 @@
 EXTRA_DIST	= README $(doxygen_configfile)
 
 
-cluttermm-reference: $(doxygen_configfile)
+clutter-cairomm-reference: $(doxygen_configfile)
 	doxygen $(doxygen_configfile)
 
-cluttermm-reference-html: cluttermm-reference
+clutter-cairomm-reference-html: clutter-cairomm-reference
 
-cluttermm-reference-html.tar.gz: cluttermm-reference-html
+clutter-cairomm-reference-html.tar.gz: clutter-cairomm-reference-html
 	tar -cf - $< | gzip > $@
 
 
-post-html: cluttermm-reference
+post-html: clutter-cairomm-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-cairomm-reference
 
 clean-local:
 	-rm -rf html
-	-rm -f cluttermm-reference-html.tar.gz
+	-rm -f clutter-cairomm-reference-html.tar.gz
 

Modified: clutter-cairomm/trunk/examples/Makefile.am_fragment
==============================================================================
--- clutter-cairomm/trunk/examples/Makefile.am_fragment	(original)
+++ clutter-cairomm/trunk/examples/Makefile.am_fragment	Tue Jul 22 20:51:24 2008
@@ -1,10 +1,9 @@
-local_cluttermm_libs = $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-$(API_VER).la
+local_clutter_cairomm_libs = $(top_builddir)/clutter-cairo/clutter-cairomm/libclutter-cairomm-$(API_VER).la
 
-LIBS  = $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
+LIBS  = $(CLUTTER_CAIROMM_LIBS) $(local_clutter_cairomm_libs)
 
-all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter \
-			   -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
-              $(CLUTTERMM_CAIRO_CFLAGS)
+all_includes = -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
+              $(CLUTTER_CAIROMM_CFLAGS)
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =

Modified: clutter-cairomm/trunk/examples/flowers.cc
==============================================================================
--- clutter-cairomm/trunk/examples/flowers.cc	(original)
+++ clutter-cairomm/trunk/examples/flowers.cc	Tue Jul 22 20:51:24 2008
@@ -7,7 +7,7 @@
  * I C++ified this a bit. armin.
  */
 
-#include <cluttermm-cairo.h>
+#include <clutter-cairomm.h>
 #include <cluttermm.h>
 
 #include <cstdlib>

Modified: clutter-cairomm/trunk/examples/simple-cairo.cc
==============================================================================
--- clutter-cairomm/trunk/examples/simple-cairo.cc	(original)
+++ clutter-cairomm/trunk/examples/simple-cairo.cc	Tue Jul 22 20:51:24 2008
@@ -2,7 +2,7 @@
  * Pretty cairo flower hack.
  */
 
-#include <cluttermm-cairo.h>
+#include <clutter-cairomm.h>
 #include <clutter/clutter.h>
 
 int

Modified: clutter-cairomm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- clutter-cairomm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ clutter-cairomm/trunk/tools/extra_defs_gen/Makefile.am	Tue Jul 22 20:51:24 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
+noinst_PROGRAMS = generate_extra_defs_clutter_cairo
 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)
+generate_extra_defs_clutter_cairo_CXXFLAGS = $(CLUTTER_CAIROMM_CFLAGS)
+generate_extra_defs_clutter_cairo_LDADD = $(CLUTTER_CAIROMM_LIBS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]