gnomemm r1302 - in gstreamermm/trunk: . docs/reference examples gstreamer gstreamer/gstreamermm gstreamer/gstreamermm/private tests tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Sat Jan 26 11:10:03 2008
New Revision: 1302
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1302&view=rev

Log:
2008-01-26  Murray Cumming  <murrayc murrayc com>

* configure.ac:
* docs/reference/Makefile.am:
* examples/Makefile.am_fragment:
* gstreamer/Makefile.am:
* gstreamer/gstreamermm-0.10.pc.in:
* gstreamer/gstreamermm-1.0.pc.in:
* gstreamer/gstreamermm/Makefile.am:
* gstreamer/gstreamermm/private/Makefile.am:
* tests/Makefile.am:
* tools/m4/Makefile.am: Rename the library and 
pkg-config file from -1.0 to -0.10, to match 
the C library. This will make life less awkward 
for us when gstreamer does a new parallel-installed 
version in future.

Added:
   gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in
      - copied, changed from r1300, /gstreamermm/trunk/gstreamer/gstreamermm-1.0.pc.in
Removed:
   gstreamermm/trunk/gstreamer/gstreamermm-1.0.pc.in
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/configure.ac
   gstreamermm/trunk/docs/reference/Makefile.am
   gstreamermm/trunk/examples/Makefile.am_fragment
   gstreamermm/trunk/gstreamer/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
   gstreamermm/trunk/tests/Makefile.am
   gstreamermm/trunk/tools/m4/Makefile.am

Modified: gstreamermm/trunk/configure.ac
==============================================================================
--- gstreamermm/trunk/configure.ac	(original)
+++ gstreamermm/trunk/configure.ac	Sat Jan 26 11:10:03 2008
@@ -14,8 +14,8 @@
 
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([GSTMM_MAJOR_VERSION],     [0])
-pushdef([GSTMM_MINOR_VERSION],     [1])
-pushdef([GSTMM_MICRO_VERSION],     [0])
+pushdef([GSTMM_MINOR_VERSION],     [9])
+pushdef([GSTMM_MICRO_VERSION],     [1])
 pushdef([GSTMM_EXTRA_VERSION],     [])
 pushdef([GSTMM_VERSION], GSTMM_MAJOR_VERSION.GSTMM_MINOR_VERSION.GSTMM_MICRO_VERSION[]GSTMM_EXTRA_VERSION)
 AC_INIT([gstreamermm], GSTMM_VERSION, [Milosz Derezynski <internalerror gmail com>, Rob Page <page rob gmail com>, Dodji Seketeli <dodji gnome org>])
@@ -299,7 +299,7 @@
   Makefile
 
   gstreamer/Makefile
-  gstreamer/gstreamermm-1.0.pc
+  gstreamer/gstreamermm-0.10.pc
     gstreamer/src/Makefile
     gstreamer/gstreamermm/Makefile
       gstreamer/gstreamermm/private/Makefile

Modified: gstreamermm/trunk/docs/reference/Makefile.am
==============================================================================
--- gstreamermm/trunk/docs/reference/Makefile.am	(original)
+++ gstreamermm/trunk/docs/reference/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -11,7 +11,7 @@
 cssfiles=$(shell ls -1 html/*.css)
 websitefiles=reference-index.txt
 
-docdir = $(datadir)/doc/gstmm-1.0/docs
+docdir = $(datadir)/doc/gstreamermm-0.10/docs
 htmldocumentationdir=$(docdir)/reference/html
 htmldocumentation_DATA=$(htmlfiles) $(pngfiles) $(giffiles) $(cssfiles)
 

Modified: gstreamermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- gstreamermm/trunk/examples/Makefile.am_fragment	(original)
+++ gstreamermm/trunk/examples/Makefile.am_fragment	Sat Jan 26 11:10:03 2008
@@ -1,4 +1,4 @@
-local_gstmm_lib		= $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-1.0.la
+local_gstmm_lib		= $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
 
 LIBS  = $(local_gstmm_lib) $(GSTMM_LIBS) $(GSTMM_EXAMPLES_LIBS)
 
@@ -11,7 +11,7 @@
 
 INCLUDES = -I. -I$(srcdir) $(strip $(all_includes))
 
-gstmm_docdir = $(datadir)/doc/gstmm-1.0
+gstmm_docdir = $(datadir)/doc/gstreamermm-0.10
 
 install-example-src:
 	@$(NORMAL_INSTALL)

Modified: gstreamermm/trunk/gstreamer/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -1,13 +1,13 @@
 SUBDIRS = src gstreamermm
 
-EXTRA_DIST = README gstmmconfig.h.in gstreamermm-1.0.pc.in gstreamermm.h
+EXTRA_DIST = README gstmmconfig.h.in gstreamermm-0.10.pc.in gstreamermm.h
 
-gstreamermm_includedir = $(includedir)/gstreamermm-1.0
+gstreamermm_includedir = $(includedir)/gstreamermm-0.10
 gstreamermm_include_DATA = gstreamermm.h
 
-gstreamermm_configdir       = $(libdir)/gstreamermm-1.0/include
+gstreamermm_configdir       = $(libdir)/gstreamermm-0.10/include
 gstreamermm_config_DATA     = gstmmconfig.h
 
 pkgconfigdir          = $(libdir)/pkgconfig
-pkgconfig_DATA        = gstreamermm-1.0.pc
+pkgconfig_DATA        = gstreamermm-0.10.pc
 

Copied: gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in (from r1300, /gstreamermm/trunk/gstreamer/gstreamermm-1.0.pc.in)
==============================================================================
--- /gstreamermm/trunk/gstreamer/gstreamermm-1.0.pc.in	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm-0.10.pc.in	Sat Jan 26 11:10:03 2008
@@ -8,4 +8,4 @@
 Requires: glibmm-2.4 gstreamer-0.10 
 Version: @VERSION@
 Libs: -L${libdir} -lgstmm-1.0
-Cflags: -I${includedir}/gstmm-1.0 -I${libdir}/gstmm-1.0/include
+Cflags: -I${includedir}/gstreamermm-0.10 -I${libdir}/gstreamermm-0.10/include

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -4,7 +4,7 @@
 SUBDIRS                 = private
 
 sublib_name             = gstreamermm
-sublib_libname          = gstreamermm-1.0
+sublib_libname          = gstreamermm-0.10
 sublib_libversion       = $(LIBGSTMM_SO_VERSION)
 sublib_namespace        = Gst
 sublib_cflags           = $(GSTMM_CFLAGS)
@@ -23,8 +23,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build.am_fragment
 
-lib_LTLIBRARIES = libgstreamermm-1.0.la
-libgstreamermm_1_0_la_SOURCES = $(files_built_cc) $(files_extra_cc)
-libgstreamermm_1_0_la_LDFLAGS = $(common_ldflags)
-libgstreamermm_1_0_la_LIBADD  = $(GSTMM_LIBS)
+lib_LTLIBRARIES = libgstreamermm-0.10.la
+libgstreamermm_0_10_la_SOURCES = $(files_built_cc) $(files_extra_cc)
+libgstreamermm_0_10_la_LDFLAGS = $(common_ldflags)
+libgstreamermm_0_10_la_LIBADD  = $(GSTMM_LIBS)
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -11,7 +11,7 @@
 dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h)
 DISTFILES = $(DIST_COMMON) $(dist_sources)
 
-private_includedir	= $(includedir)/gstreamermm-1.0/gstreamermm/private
+private_includedir	= $(includedir)/gstreamermm-0.10/gstreamermm/private
 private_include_HEADERS	= $(files_built_p_h) $(files_extra_p_h)
 
 maintainer-clean-local:

Modified: gstreamermm/trunk/tests/Makefile.am
==============================================================================
--- gstreamermm/trunk/tests/Makefile.am	(original)
+++ gstreamermm/trunk/tests/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -1,6 +1,6 @@
 INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gstreamer @GSTMM_CFLAGS@
 
-LDADD=$(top_builddir)/gstreamer/gstreamermm/libgstreamermm-1.0.la
+LDADD=$(top_builddir)/gstreamer/gstreamermm/libgstreamermm-0.10.la
 
 noinst_PROGRAMS = test-create-element test-pipeline-add-element \
                   test-link-elements test-create-bin test-miniobject-wrap \

Modified: gstreamermm/trunk/tools/m4/Makefile.am
==============================================================================
--- gstreamermm/trunk/tools/m4/Makefile.am	(original)
+++ gstreamermm/trunk/tools/m4/Makefile.am	Sat Jan 26 11:10:03 2008
@@ -5,6 +5,6 @@
 
 # Install the .m4, files:
 
-tools_m4_includedir = $(libdir)/gstmm-1.0/proc/m4
+tools_m4_includedir = $(libdir)/gstreamermm-0.10/proc/m4
 tools_m4_include_HEADERS = $(files_tools_m4)