gnomemm r1633 - in clutter-cairomm/trunk: . clutter-cairo clutter-cairo/clutter-cairomm clutter-cairo/src

[murrayc svn gnome org]

Author: murrayc
Date: Fri Jul 25 10:37:03 2008
New Revision: 1633
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1633&view=rev

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

* clutter-cairo/clutter-cairomm-config.h.in:
* clutter-cairo/clutter-cairomm/init.cc:
* clutter-cairo/clutter-cairomm/init.h:
* clutter-cairo/clutter-cairomm/wrap_init.h:
Corrected some header guards.

* clutter-cairo/clutter-cairomm.pc.in: Corrected the library name.

Modified:
   clutter-cairomm/trunk/ChangeLog
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.h
   clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/wrap_init.h
   clutter-cairomm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment
   clutter-cairomm/trunk/clutter-cairo/src/cairo-texture.hg
   clutter-cairomm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in	Fri Jul 25 10:37:03 2008
@@ -1,13 +1,13 @@
-#ifndef _LIBCLUTTERMM_CONFIG_H
-#define _LIBCLUTTERMM_CONFIG_H 1
+#ifndef _LIBCLUTTER_CAIROMM_CONFIG_H
+#define _LIBCLUTTER_CAIROMM_CONFIG_H 1
 
 #include "glibmmconfig.h"
 
 /* version numbers */
-#undef LIBCLUTTERMM_MAJOR_VERSION
-#undef LIBCLUTTERMM_MINOR_VERSION
-#undef LIBCLUTTERMM_MICRO_VERSION
-#undef LIBCLUTTERMM_VERSION
+#undef LIBCLUTTER_CAIROMM_MAJOR_VERSION
+#undef LIBCLUTTER_CAIROMM_MINOR_VERSION
+#undef LIBCLUTTER_CAIROMM_MICRO_VERSION
+#undef LIBCLUTTER_CAIROMM_VERSION
 
-#endif /* _LIBCLUTTERMM_CONFIG_H */
+#endif /* _LIBCLUTTER_CAIROMM_CONFIG_H */
 

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in	Fri Jul 25 10:37:03 2008
@@ -7,5 +7,5 @@
 Description: C++ wrapper for clutter
 Requires: clutter- API_VER@ cluttermm- API_VER@ cairomm-1.0
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-cairo- API_VER@
+Libs: -L${libdir} -lclutter-cairomm- API_VER@
 Cflags: -I${includedir}/clutter-cairomm- API_VER@

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.cc	Fri Jul 25 10:37:03 2008
@@ -23,14 +23,16 @@
 
 namespace Clutter
 {
+
 namespace Cairo
 {
 
 void init(int* nargs, gchar **args[])
 {
-  Clutter::init (nargs, args);
-  wrap_init (); //Tells the Glib::wrap() table about the libclutter-cairomm classes.
+  Clutter::init(nargs, args);
+  wrap_init(); //Tells the Glib::wrap() table about the libclutter-cairomm classes.
 }
 
 } //namespace Cairo
+
 } //namespace Clutter

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.h
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.h	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/init.h	Fri Jul 25 10:37:03 2008
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef _LIBCLUTTERMM_CAIRO_INIT_H
-#define _LIBCLUTTERMM_CAIRO_INIT_H
+#ifndef _LIBCLUTTER_CAIROMM_INIT_H
+#define _LIBCLUTTER_CAIROMM_INIT_H
 /*
  * Copyright 2008 Jonathon Jongsma
  *
@@ -23,13 +23,15 @@
 
 namespace Clutter
 {
+
 namespace Cairo
 {
 
 void init(int* nargs, gchar** args[]);
 
 } //namespace Cairo
+
 } //namespace Clutter
 
-#endif //_LIBCLUTTERMM_CAIRO_INIT_H
+#endif //_LIBCLUTTER_CAIROMM_INIT_H
 

Modified: clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/wrap_init.h
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/wrap_init.h	(original)
+++ clutter-cairomm/trunk/clutter-cairo/clutter-cairomm/wrap_init.h	Fri Jul 25 10:37:03 2008
@@ -1,5 +1,5 @@
-#ifndef _LIBCLUTTERMM_WRAP_INIT_H
-#define _LIBCLUTTERMM_WRAP_INIT_H
+#ifndef _LIBCLUTTER_CAIROMM_WRAP_INIT_H
+#define _LIBCLUTTER_CAIROMM_WRAP_INIT_H
 
 /* wrap_init.h
  *
@@ -29,4 +29,4 @@
 
 } //namespace Clutter
 
-#endif // _LIBCLUTTERMM_WRAP_INIT_H
+#endif // _LIBCLUTTER_CAIROMM_WRAP_INIT_H

Modified: clutter-cairomm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment	(original)
+++ clutter-cairomm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment	Fri Jul 25 10:37:03 2008
@@ -2,5 +2,4 @@
 # The include happens in Makefile.am, not Makefile.in or Makefile,
 # so it's like copy-and-pasting this into each of those Makefile.am files.
 
-files_hg = \
-		   cairo-texture.hg
+files_hg = cairo-texture.hg

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	Fri Jul 25 10:37:03 2008
@@ -24,6 +24,7 @@
 
 namespace Clutter
 {
+
 namespace Cairo
 {
 
@@ -46,6 +47,7 @@
 };
 
 } // namespace Cairo
+
 } // namespace Clutter
 
 //vim: ts=2,sw=2

Modified: clutter-cairomm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml
==============================================================================
--- clutter-cairomm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml	(original)
+++ clutter-cairomm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml	Fri Jul 25 10:37:03 2008
@@ -0,0 +1,2 @@
+<root>
+</root>