gnomemm r1634 - in clutter-gtkmm/trunk: . clutter-gtk clutter-gtk/clutter-gtkmm tools/m4
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1634 - in clutter-gtkmm/trunk: . clutter-gtk clutter-gtk/clutter-gtkmm tools/m4
- Date: Fri, 25 Jul 2008 10:41:02 +0000 (UTC)
Author: murrayc
Date: Fri Jul 25 10:41:02 2008
New Revision: 1634
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1634&view=rev
Log:
2008-07-25 Murray Cumming <murrayc murrayc com>
* clutter-gtk/clutter-gtkmm-config.h.in: Corrected the header guard.
* clutter-gtk/clutter-gtkmm/wrap_init.h: Corrected the namespace
* tools/m4/Makefile.am:
* tools/m4/Makefile_list_of_sources.am_fragment:
* tools/m4/convert_cluttermm.m4: Renamed to convert_clutter-gtkmm.m4
Added:
clutter-gtkmm/trunk/tools/m4/convert_clutter-gtkmm.m4
- copied unchanged from r1629, /clutter-gtkmm/trunk/tools/m4/convert_cluttermm.m4
Removed:
clutter-gtkmm/trunk/tools/m4/convert_cluttermm.m4
Modified:
clutter-gtkmm/trunk/ChangeLog
clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm-config.h.in
clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h
clutter-gtkmm/trunk/tools/m4/Makefile.am
clutter-gtkmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm-config.h.in
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm-config.h.in (original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm-config.h.in Fri Jul 25 10:41:02 2008
@@ -1,13 +1,13 @@
-#ifndef _LIBCLUTTERMM_CONFIG_H
-#define _LIBCLUTTERMM_CONFIG_H 1
+#ifndef _LIBCLUTTER_GTKMM_CONFIG_H
+#define _LIBCLUTTER_GTKMM_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_GTKMM_MAJOR_VERSION
+#undef LIBCLUTTER_GTKMM_MINOR_VERSION
+#undef LIBCLUTTER_GTKMM_MICRO_VERSION
+#undef LIBCLUTTER_GTKMM_VERSION
-#endif /* _LIBCLUTTERMM_CONFIG_H */
+#endif /* _LIBCLUTTER_GTKMM_CONFIG_H */
Modified: clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h (original)
+++ clutter-gtkmm/trunk/clutter-gtk/clutter-gtkmm/wrap_init.h Fri Jul 25 10:41:02 2008
@@ -25,8 +25,13 @@
namespace Clutter
{
+namespace Gtk
+{
+
void wrap_init();
+} //namespace Gtk
+
} //namespace Clutter
#endif // _LIBCLUTTER_GTKMM_WRAP_INIT_H
Modified: clutter-gtkmm/trunk/tools/m4/Makefile.am
==============================================================================
--- clutter-gtkmm/trunk/tools/m4/Makefile.am (original)
+++ clutter-gtkmm/trunk/tools/m4/Makefile.am Fri Jul 25 10:41:02 2008
@@ -5,5 +5,5 @@
# Install the .m4, files:
-tools_m4_includedir = $(libdir)/cluttermm-$(API_VER)/proc/m4
+tools_m4_includedir = $(libdir)/clutter-gtkmm-$(API_VER)/proc/m4
tools_m4_include_HEADERS = $(files_tools_m4)
Modified: clutter-gtkmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
==============================================================================
--- clutter-gtkmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment (original)
+++ clutter-gtkmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment Fri Jul 25 10:41:02 2008
@@ -1 +1 @@
-files_tools_m4 = convert.m4 convert_cluttermm.m4
+files_tools_m4 = convert.m4 convert_clutter-gtkmm.m4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]