GNOME.org
 

gnomemm r1475 - in cluttermm/trunk: . clutter clutter-cairo clutter-cairo/cluttermm-cairo clutter-gtk clutter-gtk/cluttermm-gtk clutter/cluttermm clutter/cluttermm/private examples

Author: jjongsma
Date: Wed Apr 23 02:26:04 2008
New Revision: 1475
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1475&view=rev

Log:
Change API version from -1.0 to -0.6 to match base clutter library


Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter-cairo/Makefile.am
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am
   cluttermm/trunk/clutter-gtk/Makefile.am
   cluttermm/trunk/clutter-gtk/cluttermm-gtk/Makefile.am
   cluttermm/trunk/clutter/Makefile.am
   cluttermm/trunk/clutter/cluttermm.pc.in
   cluttermm/trunk/clutter/cluttermm/Makefile.am
   cluttermm/trunk/clutter/cluttermm/private/Makefile.am
   cluttermm/trunk/clutter/cluttermmconfig.h.in
   cluttermm/trunk/configure.in
   cluttermm/trunk/examples/Makefile.am_fragment

Modified: cluttermm/trunk/clutter-cairo/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter-cairo/Makefile.am	(original)
+++ cluttermm/trunk/clutter-cairo/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -2,14 +2,14 @@
 
 EXTRA_DIST	= README					\
 		  cluttermm-cairo-config.h.in cluttermm-cairo.h	\
-		  cluttermm-cairo-1.0.pc.in
+		  cluttermm-cairo.pc.in
 
-cluttermm_includedir		= $(includedir)/$(CLUTTERMM_CAIRO_API_VER)
+cluttermm_includedir		= $(includedir)/cluttermm-cairo-$(API_VER)
 cluttermm_include_HEADERS	= cluttermm-cairo.h
 
-cluttermm_configdir		= $(libdir)/$(CLUTTERMM_CAIRO_API_VER)/include
+cluttermm_configdir		= $(libdir)/cluttermm-cairo-$(API_VER)/include
 cluttermm_config_DATA	= cluttermm-cairo-config.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= cluttermm-cairo-1.0.pc
+pkgconfig_DATA		= cluttermm-cairo-$(API_VER).pc
 

Modified: cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am	(original)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -1,13 +1,13 @@
 ## Copyright (c) 2001
 ## The cluttermm development team.
 
-SUBDIRS			= private
+SUBDIRS = private
 
-sublib_name		= cluttermm-cairo
-sublib_libname = cluttermm-cairo-1.0
+sublib_name = cluttermm-cairo
+sublib_libname = cluttermm-cairo-$(API_VER)
 sublib_libversion = $(CLUTTERMM_SO_VERSION)
-sublib_namespace	= Clutter
-sublib_cflags		= $(CLUTTERMM_CAIRO_CFLAGS) -I$(top_srcdir)/clutter
+sublib_namespace = Clutter
+sublib_cflags = $(CLUTTERMM_CAIRO_CFLAGS) -I$(top_srcdir)/clutter
 sublib_topdir = clutter-cairo
 
 
@@ -16,9 +16,9 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES			= libcluttermm-cairo-1.0.la
-libcluttermm_cairo_1_0_la_SOURCES	= $(files_all_cc)
-libcluttermm_cairo_1_0_la_LDFLAGS	= $(common_ldflags)
-libcluttermm_cairo_1_0_la_LIBADD	= $(CLUTTERMM_CAIRO_LIBS) \
-									  $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la
+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
 

Modified: cluttermm/trunk/clutter-gtk/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter-gtk/Makefile.am	(original)
+++ cluttermm/trunk/clutter-gtk/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -2,14 +2,14 @@
 
 EXTRA_DIST	= README					\
 		  cluttermm-gtk-config.h.in cluttermm-gtk.h	\
-		  cluttermm-gtk-1.0.pc.in
+		  cluttermm-gtk.pc.in
 
-cluttermm_includedir		= $(includedir)/$(CLUTTERMM_GTK_API_VER)
+cluttermm_includedir		= $(includedir)/cluttermm-gtk-$(API_VER)
 cluttermm_include_HEADERS	= cluttermm-gtk.h
 
-cluttermm_configdir		= $(libdir)/$(CLUTTERMM_GTK_API_VER)/include
+cluttermm_configdir		= $(libdir)/cluttermm-gtk-$(API_VER)/include
 cluttermm_config_DATA	= cluttermm-gtk-config.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= cluttermm-gtk-1.0.pc
+pkgconfig_DATA		= cluttermm-gtk-$(API_VER).pc
 

Modified: cluttermm/trunk/clutter-gtk/cluttermm-gtk/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter-gtk/cluttermm-gtk/Makefile.am	(original)
+++ cluttermm/trunk/clutter-gtk/cluttermm-gtk/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -1,24 +1,23 @@
-## Copyright (c) 2001
+## Copyright (c) 2008
 ## The cluttermm development team.
 
-SUBDIRS			= private
+SUBDIRS = private
 
-sublib_name		= cluttermm-gtk
-sublib_libname = cluttermm-gtk-1.0
+sublib_name = cluttermm-gtk
+sublib_libname = cluttermm-gtk-$(API_VER)
 sublib_libversion = $(CLUTTERMM_SO_VERSION)
-sublib_namespace	= Clutter
-sublib_cflags		= $(CLUTTERMM_GTK_CFLAGS) -I$(top_srcdir)/clutter
+sublib_namespace = Clutter
+sublib_cflags = $(CLUTTERMM_GTK_CFLAGS) -I$(top_srcdir)/clutter
 sublib_topdir = clutter-gtk
 
-
-files_extra_h	= wrap_init.h init.h
-files_extra_cc	= init.cc
+files_extra_h = wrap_init.h init.h
+files_extra_cc = init.cc
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES			= libcluttermm-gtk-1.0.la
-libcluttermm_gtk_1_0_la_SOURCES	= $(files_all_cc)
-libcluttermm_gtk_1_0_la_LDFLAGS	= $(common_ldflags)
-libcluttermm_gtk_1_0_la_LIBADD	= $(CLUTTERMM_GTK_LIBS) \
-									  $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la
+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
 

Modified: cluttermm/trunk/clutter/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter/Makefile.am	(original)
+++ cluttermm/trunk/clutter/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -2,14 +2,14 @@
 
 EXTRA_DIST	= README					\
 		  cluttermmconfig.h.in cluttermm.h	\
-		  cluttermm-1.0.pc.in
+		  cluttermm.pc.in
 
-cluttermm_includedir		= $(includedir)/$(CLUTTERMM_API_VER)
+cluttermm_includedir		= $(includedir)/cluttermm-$(API_VER)
 cluttermm_include_HEADERS	= cluttermm.h
 
-cluttermm_configdir		= $(libdir)/$(CLUTTERMM_API_VER)/include
+cluttermm_configdir		= $(libdir)/cluttermm-$(API_VER)/include
 cluttermm_config_DATA	= cluttermmconfig.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= cluttermm-1.0.pc
+pkgconfig_DATA		= cluttermm-$(API_VER).pc
 

Modified: cluttermm/trunk/clutter/cluttermm.pc.in
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.pc.in	(original)
+++ cluttermm/trunk/clutter/cluttermm.pc.in	Wed Apr 23 02:26:04 2008
@@ -7,5 +7,5 @@
 Description: C++ wrapper for clutter
 Requires: gtkmm-2.4 clutter-0.6
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-1.0
-Cflags: -I${includedir}/@CLUTTERMM_API_VER@
+Libs: -L${libdir} -lcluttermm- API_VER@
+Cflags: -I${includedir}/cluttermm- API_VER@

Modified: cluttermm/trunk/clutter/cluttermm/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/Makefile.am	(original)
+++ cluttermm/trunk/clutter/cluttermm/Makefile.am	Wed Apr 23 02:26:04 2008
@@ -1,23 +1,23 @@
-## Copyright (c) 2001
+## Copyright (c) 2008
 ## The cluttermm development team.
 
 SUBDIRS			= private
 
 sublib_name		= cluttermm
-sublib_libname = cluttermm-1.0
+sublib_libname = cluttermm-$(API_VER)
 sublib_libversion = $(CLUTTERMM_SO_VERSION)
 sublib_namespace	= Clutter
 sublib_cflags		= $(CLUTTERMM_CFLAGS)
 sublib_topdir = clutter
 
 
-files_extra_h	= init.h types.h wrap_init.h 
+files_extra_h	= init.h types.h wrap_init.h
 files_extra_cc	= init.cc
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES			= libcluttermm-1.0.la
-libcluttermm_1_0_la_SOURCES	= $(files_all_cc)
-libcluttermm_1_0_la_LDFLAGS	= $(common_ldflags)
-libcluttermm_1_0_la_LIBADD	= $(CLUTTERMM_LIBS)
+lib_LTLIBRARIES = libcluttermm- API_VER@.la
+libcluttermm_ API_VER@_la_SOURCES = $(files_all_cc)
+libcluttermm_ API_VER@_la_LDFLAGS = $(common_ldflags)
+libcluttermm_ API_VER@_la_LIBADD = $(CLUTTERMM_LIBS)
 

Modified: cluttermm/trunk/clutter/cluttermm/private/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/private/Makefile.am	(original)
+++ cluttermm/trunk/clutter/cluttermm/private/Makefile.am	Wed Apr 23 02:26:04 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_API_VER)/cluttermm/private
+private_includedir	= ${includedir}/cluttermm-$(API_VER)/cluttermm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Modified: cluttermm/trunk/clutter/cluttermmconfig.h.in
==============================================================================
--- cluttermm/trunk/clutter/cluttermmconfig.h.in	(original)
+++ cluttermm/trunk/clutter/cluttermmconfig.h.in	Wed Apr 23 02:26:04 2008
@@ -1,13 +1,67 @@
-#ifndef _LIBCLUTTERMM_CONFIG_H
-#define _LIBCLUTTERMM_CONFIG_H 1
+/* clutter/cluttermmconfig.h.in.  Generated from configure.in by autoheader.  */
 
-#include "glibmmconfig.h"
+/* major version */
+#undef CLUTTERMM_MAJOR_VERSION
 
-/* version numbers */
-#undef LIBCLUTTERMM_MAJOR_VERSION
-#undef LIBCLUTTERMM_MINOR_VERSION
-#undef LIBCLUTTERMM_MICRO_VERSION
-#undef LIBCLUTTERMM_VERSION
+/* micro version */
+#undef CLUTTERMM_MICRO_VERSION
 
-#endif /* _LIBCLUTTERMM_CONFIG_H */
+/* minor version */
+#undef CLUTTERMM_MINOR_VERSION
 
+/* cluttermm version string */
+#undef CLUTTERMM_VERSION
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Wed Apr 23 02:26:04 2008
@@ -18,10 +18,10 @@
 
 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)
-AC_DEFINE_UNQUOTED(CLUTTERMM_MINOR_VERSION, $CLUTTERMM_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(CLUTTERMM_MICRO_VERSION, $CLUTTERMM_MICRO_VERSION)
-AC_DEFINE_UNQUOTED(CLUTTERMM_VERSION, "$CLUTTERMM_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)
@@ -72,29 +72,26 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
+
 PKG_CHECK_MODULES(CLUTTERMM,
                   gtkmm-2.4 >= 2.10.9
                   clutter-0.6)
 AC_SUBST(CLUTTERMM_CFLAGS)
 AC_SUBST(CLUTTERMM_LIBS)
 
-CLUTTERMM_API_VER=[cluttermm-1.0]
-AC_SUBST(CLUTTERMM_API_VER)
-
 PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
                   [gtkmm-2.4
                    clutter-cairo-0.6
                    cairomm-1.0])
 
-CLUTTERMM_CAIRO_API_VER=[cluttermm-cairo-1.0]
-AC_SUBST(CLUTTERMM_CAIRO_API_VER)
-
 PKG_CHECK_MODULES(CLUTTERMM_GTK,
                   [gtkmm-2.4
                    clutter-gtk-0.6])
 
-CLUTTERMM_GTK_API_VER=[cluttermm-gtk-1.0]
-AC_SUBST(CLUTTERMM_GTK_API_VER)
+# the API version of the library.  Libraries and pkg-config files will have this
+# value appended to them, e.g. libclutter-0.6.so
+API_VER=[0.6]
+AC_SUBST(API_VER)
 
 GMM_PROCDIR=`pkg-config --variable=gmmprocdir glibmm-2.4`
 AC_SUBST(GMM_PROCDIR)
@@ -117,19 +114,19 @@
   Makefile
 
   clutter/Makefile
-  clutter/$CLUTTERMM_API_VER.pc:clutter/cluttermm.pc.in
+  clutter/cluttermm-$API_VER.pc:clutter/cluttermm.pc.in
   clutter/src/Makefile
   clutter/cluttermm/Makefile
   clutter/cluttermm/private/Makefile
 
   clutter-cairo/Makefile
-  clutter-cairo/$CLUTTERMM_CAIRO_API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
+  clutter-cairo/cluttermm-cairo-$API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
   clutter-cairo/src/Makefile
   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/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

Modified: cluttermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- cluttermm/trunk/examples/Makefile.am_fragment	(original)
+++ cluttermm/trunk/examples/Makefile.am_fragment	Wed Apr 23 02:26:04 2008
@@ -1,6 +1,6 @@
-local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la \
-					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-1.0.la \
-					   $(top_builddir)/clutter-gtk/cluttermm-gtk/libcluttermm-gtk-1.0.la
+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
 
 LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(CLUTTERMM_GTK_LIBS) $(local_cluttermm_libs)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]