gnomemm r1463 - in cluttermm/trunk: . clutter clutter/cluttermm clutter/cluttermm/private examples

[jjongsma svn gnome org]

Author: jjongsma
Date: Wed Apr 16 03:49:05 2008
New Revision: 1463
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1463&view=rev

Log:
	* configure.in: bumped version number to 0.5.1
	* clutter/Makefile.am:
	* clutter/cluttermm-1.0.pc.in:
	* clutter/cluttermm/Makefile.am:
	* clutter/cluttermm/private/Makefile.am:
	* examples/Makefile.am_fragment: previously, the library name was a mixture
	of cluttermm-1.0 and cluttermm-0.1.  The pkg-config file and include
	directories were 1.0, but the .so files were named -0.1.  Now everything
	should be named -1.0



Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/Makefile.am
   cluttermm/trunk/clutter/cluttermm-1.0.pc.in
   cluttermm/trunk/clutter/cluttermm/Makefile.am
   cluttermm/trunk/clutter/cluttermm/private/Makefile.am
   cluttermm/trunk/configure.in
   cluttermm/trunk/examples/Makefile.am_fragment

Modified: cluttermm/trunk/clutter/Makefile.am
==============================================================================
--- cluttermm/trunk/clutter/Makefile.am	(original)
+++ cluttermm/trunk/clutter/Makefile.am	Wed Apr 16 03:49:05 2008
@@ -4,10 +4,10 @@
 		  cluttermmconfig.h.in cluttermm.h	\
 		  cluttermm-1.0.pc.in
 
-cluttermm_includedir		= $(includedir)/cluttermm-0.1
+cluttermm_includedir		= $(includedir)/$(CLUTTERMM_API_VER)
 cluttermm_include_HEADERS	= cluttermm.h
 
-cluttermm_configdir		= $(libdir)/cluttermm-0.1/include
+cluttermm_configdir		= $(libdir)/$(CLUTTERMM_API_VER)/include
 cluttermm_config_DATA	= cluttermmconfig.h
 
 pkgconfigdir		= $(libdir)/pkgconfig

Modified: cluttermm/trunk/clutter/cluttermm-1.0.pc.in
==============================================================================
--- cluttermm/trunk/clutter/cluttermm-1.0.pc.in	(original)
+++ cluttermm/trunk/clutter/cluttermm-1.0.pc.in	Wed Apr 16 03:49:05 2008
@@ -7,5 +7,5 @@
 Description: C++ wrapper for clutter
 Requires: gtkmm-2.4 clutter-0.6
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-0.1
-Cflags: -I${includedir}/cluttermm-0.1
+Libs: -L${libdir} -lcluttermm-1.0
+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 16 03:49:05 2008
@@ -4,7 +4,7 @@
 SUBDIRS			= private
 
 sublib_name		= cluttermm
-sublib_libname = cluttermm-0.1
+sublib_libname = cluttermm-1.0
 sublib_libversion = $(CLUTTERMM_SO_VERSION)
 sublib_namespace	= Clutter
 sublib_cflags		= $(CLUTTERMM_CFLAGS)
@@ -16,8 +16,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES			= libcluttermm-0.1.la
-libcluttermm_0_1_la_SOURCES	= $(files_all_cc)
-libcluttermm_0_1_la_LDFLAGS	= $(common_ldflags)
-libcluttermm_0_1_la_LIBADD	= $(CLUTTERMM_LIBS)
+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)
 

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 16 03:49:05 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-0.1/cluttermm/private
+private_includedir	= ${includedir}/$(CLUTTERMM_API_VER)/cluttermm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Wed Apr 16 03:49:05 2008
@@ -17,7 +17,7 @@
 #########################################################################
 CLUTTERMM_MAJOR_VERSION=0
 CLUTTERMM_MINOR_VERSION=5
-CLUTTERMM_MICRO_VERSION=0
+CLUTTERMM_MICRO_VERSION=1
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -96,6 +96,9 @@
 GMM_PROC=$GMM_PROCDIR/gmmproc
 AC_SUBST(GMM_PROC)
 
+CLUTTERMM_API_VER=[cluttermm-1.0]
+AC_SUBST(CLUTTERMM_API_VER)
+
 #########################################################################
 #  C++ checks
 #########################################################################

Modified: cluttermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- cluttermm/trunk/examples/Makefile.am_fragment	(original)
+++ cluttermm/trunk/examples/Makefile.am_fragment	Wed Apr 16 03:49:05 2008
@@ -1,4 +1,4 @@
-local_cluttermm_lib = $(top_builddir)/clutter/cluttermm/libcluttermm-0.1.la
+local_cluttermm_lib = $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la
 
 LIBS  = $(CLUTTERMM_LIBS) $(local_cluttermm_lib)