diff options
-rw-r--r-- | cairomm/Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 32 | ||||
-rw-r--r-- | data/cairomm-1.14.pc.in (renamed from data/cairomm-1.0.pc.in) | 0 | ||||
-rw-r--r-- | data/cairomm-ft-1.14.pc.in (renamed from data/cairomm-ft-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-pdf-1.14.pc.in (renamed from data/cairomm-pdf-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-png-1.14.pc.in (renamed from data/cairomm-png-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-ps-1.14.pc.in (renamed from data/cairomm-ps-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-quartz-1.14.pc.in (renamed from data/cairomm-quartz-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-quartz-font-1.14.pc.in (renamed from data/cairomm-quartz-font-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-quartz-image-1.14.pc.in (renamed from data/cairomm-quartz-image-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-svg-1.14.pc.in (renamed from data/cairomm-svg-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-win32-1.14.pc.in (renamed from data/cairomm-win32-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-win32-font-1.14.pc.in (renamed from data/cairomm-win32-font-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-xlib-1.14.pc.in (renamed from data/cairomm-xlib-1.0.pc.in) | 2 | ||||
-rw-r--r-- | data/cairomm-xlib-xrender-1.14.pc.in (renamed from data/cairomm-xlib-xrender-1.0.pc.in) | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
16 files changed, 33 insertions, 33 deletions
diff --git a/cairomm/Makefile.am b/cairomm/Makefile.am index a837249..da8549d 100644 --- a/cairomm/Makefile.am +++ b/cairomm/Makefile.am @@ -20,11 +20,11 @@ include $(srcdir)/filelist.am AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(CAIROMM_CFLAGS) AM_CXXFLAGS = $(CAIROMM_WXXFLAGS) -lib_LTLIBRARIES = libcairomm-1.0.la +lib_LTLIBRARIES = libcairomm-1.14.la -libcairomm_1_0_la_SOURCES = $(cairomm_cc) $(cairomm_private_h) -libcairomm_1_0_la_LDFLAGS = -no-undefined -version-info $(CAIROMM_SO_VERSION) -libcairomm_1_0_la_LIBADD = $(CAIROMM_LIBS) +libcairomm_1_14_la_SOURCES = $(cairomm_cc) $(cairomm_private_h) +libcairomm_1_14_la_LDFLAGS = -no-undefined -version-info $(CAIROMM_SO_VERSION) +libcairomm_1_14_la_LIBADD = $(CAIROMM_LIBS) cairomm_includedir = $(includedir)/$(CAIROMM_MODULE_NAME)/cairomm cairomm_include_HEADERS = $(cairomm_public_h) diff --git a/configure.ac b/configure.ac index a6e82be..844ed9e 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AM_MAINTAINER_MODE AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>]) MM_PREREQ([0.8]) -MM_INIT_MODULE([cairomm-1.0]) +MM_INIT_MODULE([cairomm-1.14]) MM_CONFIG_DOCTOOL_DIR([docs]) # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html @@ -46,7 +46,7 @@ PKG_PROG_PKG_CONFIG AC_SUBST([CAIROMM_MODULES], ['cairo >= 1.10.0 sigc++-2.0 >= 2.5.1']) cairomm_allmodules=$CAIROMM_MODULES -CAIROMM_INSTALL_PC='data/cairomm-1.0.pc' +CAIROMM_INSTALL_PC='data/cairomm-1.14.pc' for cairomm_mod in ft pdf png ps svg xlib xlib-xrender \ win32 win32-font quartz quartz-font quartz-image @@ -54,7 +54,7 @@ do PKG_CHECK_EXISTS([cairo-$cairomm_mod], [ cairomm_allmodules="$cairomm_allmodules cairo-$cairomm_mod" - CAIROMM_INSTALL_PC="$CAIROMM_INSTALL_PC data/cairomm-$cairomm_mod-1.0.pc" + CAIROMM_INSTALL_PC="$CAIROMM_INSTALL_PC data/cairomm-$cairomm_mod-1.14.pc" ]) done AC_SUBST([CAIROMM_INSTALL_PC]) @@ -125,19 +125,19 @@ AC_CONFIG_FILES([Makefile examples/Makefile docs/Makefile docs/reference/Doxyfile - data/cairomm-1.0.pc - data/cairomm-ft-1.0.pc - data/cairomm-pdf-1.0.pc - data/cairomm-png-1.0.pc - data/cairomm-ps-1.0.pc - data/cairomm-quartz-1.0.pc - data/cairomm-quartz-font-1.0.pc - data/cairomm-quartz-image-1.0.pc - data/cairomm-svg-1.0.pc - data/cairomm-win32-1.0.pc - data/cairomm-win32-font-1.0.pc - data/cairomm-xlib-1.0.pc - data/cairomm-xlib-xrender-1.0.pc + data/cairomm-1.14.pc + data/cairomm-ft-1.14.pc + data/cairomm-pdf-1.14.pc + data/cairomm-png-1.14.pc + data/cairomm-ps-1.14.pc + data/cairomm-quartz-1.14.pc + data/cairomm-quartz-font-1.14.pc + data/cairomm-quartz-image-1.14.pc + data/cairomm-svg-1.14.pc + data/cairomm-win32-1.14.pc + data/cairomm-win32-font-1.14.pc + data/cairomm-xlib-1.14.pc + data/cairomm-xlib-xrender-1.14.pc MSVC_Net2013/cairomm/cairomm.rc]) AC_CONFIG_COMMANDS([MSVC_Net2013/cairomm/cairommconfig.h], diff --git a/data/cairomm-1.0.pc.in b/data/cairomm-1.14.pc.in index d7d0fe9..d7d0fe9 100644 --- a/data/cairomm-1.0.pc.in +++ b/data/cairomm-1.14.pc.in diff --git a/data/cairomm-ft-1.0.pc.in b/data/cairomm-ft-1.14.pc.in index 0c2e666..a20b3e3 100644 --- a/data/cairomm-ft-1.0.pc.in +++ b/data/cairomm-ft-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-ft Description: C++ wrapper for cairo - ft support -Requires: cairomm-1.0 cairo-ft +Requires: cairomm-1.14 cairo-ft Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-pdf-1.0.pc.in b/data/cairomm-pdf-1.14.pc.in index 2d0d944..481011f 100644 --- a/data/cairomm-pdf-1.0.pc.in +++ b/data/cairomm-pdf-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-pdf Description: C++ wrapper for cairo - pdf support -Requires: cairomm-1.0 cairo-pdf +Requires: cairomm-1.14 cairo-pdf Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-png-1.0.pc.in b/data/cairomm-png-1.14.pc.in index 37b97cb..392f190 100644 --- a/data/cairomm-png-1.0.pc.in +++ b/data/cairomm-png-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-png Description: C++ wrapper for cairo - png support -Requires: cairomm-1.0 cairo-png +Requires: cairomm-1.14 cairo-png Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-ps-1.0.pc.in b/data/cairomm-ps-1.14.pc.in index aa5eec5..082d221 100644 --- a/data/cairomm-ps-1.0.pc.in +++ b/data/cairomm-ps-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-ps Description: C++ wrapper for cairo - postscript support -Requires: cairomm-1.0 cairo-ps +Requires: cairomm-1.14 cairo-ps Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-quartz-1.0.pc.in b/data/cairomm-quartz-1.14.pc.in index 1d0e65d..e5b2316 100644 --- a/data/cairomm-quartz-1.0.pc.in +++ b/data/cairomm-quartz-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-quartz Description: C++ wrapper for cairo - quartz support -Requires: cairomm-1.0 cairo-quartz +Requires: cairomm-1.14 cairo-quartz Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-quartz-font-1.0.pc.in b/data/cairomm-quartz-font-1.14.pc.in index 5aeb663..895da8e 100644 --- a/data/cairomm-quartz-font-1.0.pc.in +++ b/data/cairomm-quartz-font-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-quartz-font Description: C++ wrapper for cairo - quartz font support -Requires: cairomm-1.0 cairo-quartz-font +Requires: cairomm-1.14 cairo-quartz-font Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-quartz-image-1.0.pc.in b/data/cairomm-quartz-image-1.14.pc.in index 5eb7ba3..38c9545 100644 --- a/data/cairomm-quartz-image-1.0.pc.in +++ b/data/cairomm-quartz-image-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-quartz-image Description: C++ wrapper for cairo - quartz image support -Requires: cairomm-1.0 cairo-quartz-image +Requires: cairomm-1.14 cairo-quartz-image Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-svg-1.0.pc.in b/data/cairomm-svg-1.14.pc.in index ee320b6..959c998 100644 --- a/data/cairomm-svg-1.0.pc.in +++ b/data/cairomm-svg-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-svg Description: C++ wrapper for cairo - svg support -Requires: cairomm-1.0 cairo-svg +Requires: cairomm-1.14 cairo-svg Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-win32-1.0.pc.in b/data/cairomm-win32-1.14.pc.in index 711e70e..9bc1a31 100644 --- a/data/cairomm-win32-1.0.pc.in +++ b/data/cairomm-win32-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-win32 Description: C++ wrapper for cairo - win32 support -Requires: cairomm-1.0 cairo-win32 +Requires: cairomm-1.14 cairo-win32 Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-win32-font-1.0.pc.in b/data/cairomm-win32-font-1.14.pc.in index aab19c6..c8cd331 100644 --- a/data/cairomm-win32-font-1.0.pc.in +++ b/data/cairomm-win32-font-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-win32-font Description: C++ wrapper for cairo - win32 font support -Requires: cairomm-1.0 cairo-win32-font +Requires: cairomm-1.14 cairo-win32-font Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-xlib-1.0.pc.in b/data/cairomm-xlib-1.14.pc.in index a36f649..b955302 100644 --- a/data/cairomm-xlib-1.0.pc.in +++ b/data/cairomm-xlib-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-xlib Description: C++ wrapper for cairo - xlib support -Requires: cairomm-1.0 cairo-xlib +Requires: cairomm-1.14 cairo-xlib Version: @PACKAGE_VERSION@ diff --git a/data/cairomm-xlib-xrender-1.0.pc.in b/data/cairomm-xlib-xrender-1.14.pc.in index 2071f5e..d984800 100644 --- a/data/cairomm-xlib-xrender-1.0.pc.in +++ b/data/cairomm-xlib-xrender-1.14.pc.in @@ -1,4 +1,4 @@ Name: cairomm-xlib-xrender Description: C++ wrapper for cairo - xlib-xrender support -Requires: cairomm-1.0 cairo-xlib-xrender +Requires: cairomm-1.14 cairo-xlib-xrender Version: @PACKAGE_VERSION@ diff --git a/tests/Makefile.am b/tests/Makefile.am index c18d975..6c92702 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,7 @@ endif INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ #The libraries that the executable needs to link against: -LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ +LIBS = $(top_builddir)/cairomm/libcairomm-1.14.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ EXTRA_DIST=png-stream-test.png DISTCLEANFILES=test.ps test.pdf |