GNOME.org
 

[gegl-gtk] Fix up versioning

commit 14fc4cd4f1ebe32ffa72f3e14552a1ad85243a27
Author: Jon Nordby <jononor gmail com>
Date:   Thu Jun 23 20:40:56 2011 +0200

    Fix up versioning
    
    - Use gegl-gtk$gtk_version-$api_version naming
    - This is version 0.0.1
    - Set correct libtool/.so file versioning

 Makefile.am                               |    8 ++++----
 README                                    |    1 -
 configure.ac                              |   20 +++++++++++---------
 gegl-gtk/Makefile.am                      |   22 +++++++++++-----------
 gegl-gtk-2.0.pc.in => gegl-gtk2-0.1.pc.in |    4 ++--
 gegl-gtk-3.0.pc.in => gegl-gtk3-0.1.pc.in |    4 ++--
 6 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f33417..0ef1542 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,16 @@ SUBDIRS=\
 pkgconfigdir = $(libdir)/pkgconfig
 
 if HAVE_GTK2
-pkgconfig_DATA = gegl-gtk-2.0.pc
+pkgconfig_DATA = gegl-gtk2-0.1.pc
 else
-pkgconfig_DATA = gegl-gtk-3.0.pc
+pkgconfig_DATA = gegl-gtk3-0.1.pc
 endif
 
 EXTRA_DIST = \
 	$(built_dist_files) \
 	autogen.sh \
-	gegl-gtk-2.0.pc.in \
-	gegl-gtk-3.0.pc.in \
+	gegl-gtk2-0.1.pc.in \
+	gegl-gtk3-0.1.pc.in \
 	m4/introspection.m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
diff --git a/README b/README
index d46de04..601bc29 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ License: LGPLv3
 
 == TODO ==
 General
-* Rename library from gegl-gtk-{2,3}.0 to gegl-gtk{2,3}-0.1
 * Add GObject introspection support
 * Write a Gegl based GdkPixbuf loader plugin
 
diff --git a/configure.ac b/configure.ac
index 97bcad2..7140e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,9 @@ dnl if backwards compatibility has been broken,
 dnl    set GEGL_GTK_BINARY_AGE _and_ GEGL_GTK_INTERFACE_AGE to 0.
 
 m4_define([gegl_gtk_major_version], [0])
-m4_define([gegl_gtk_minor_version], [1])
-m4_define([gegl_gtk_micro_version], [0])
+m4_define([gegl_gtk_minor_version], [0])
+m4_define([gegl_gtk_micro_version], [1])
+m4_define([gegl_gtk_api_version], [0.1])
 
 m4_define([gegl_gtk_real_version],
           [gegl_gtk_major_version.gegl_gtk_minor_version.gegl_gtk_micro_version])
@@ -64,6 +65,7 @@ GEGL_GTK_BINARY_AGE=gegl_gtk_binary_age
 GEGL_GTK_VERSION=gegl_gtk_version
 GEGL_GTK_REAL_VERSION=gegl_gtk_real_version
 GEGL_GTK_VERSION=gegl_gtk_version
+GEGL_GTK_API_VERSION=gegl_gtk_api_version
 
 AC_SUBST(GEGL_GTK_MAJOR_VERSION)
 AC_SUBST(GEGL_GTK_MINOR_VERSION)
@@ -72,6 +74,7 @@ AC_SUBST(GEGL_GTK_INTERFACE_AGE)
 AC_SUBST(GEGL_GTK_BINARY_AGE)
 AC_SUBST(GEGL_GTK_VERSION)
 AC_SUBST(GEGL_GTK_REAL_VERSION)
+AC_SUBST(GEGL_GTK_API_VERSION)
 
 dnl The symbol GEGL_GTK_UNSTABLE is defined above for substitution in
 dnl Makefiles and conditionally defined here as a preprocessor symbol
@@ -205,21 +208,20 @@ AC_ARG_WITH([gtk],
 	AC_MSG_RESULT([$with_gtk])
 
 have_gtk="no"
-gegl_gtk_api_version=""
 case "$with_gtk" in
 	2.0) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= gtk2_required_version,
-		[have_gtk="2.0" GEGL_GTK_API_VERSION="2.0"
+		[have_gtk="2.0" GEGL_GTK_GTK_VERSION="2"
 		AC_DEFINE(HAVE_GTK2, 1, [Define to 1 to compile for gtk2])],
 		[]) ;;
 
 	3.0) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= gtk3_required_version,
-		[have_gtk="3.0" GEGL_GTK_API_VERSION="3.0"
+		[have_gtk="3.0" GEGL_GTK_GTK_VERSION="3"
 		AC_DEFINE(HAVE_GTK2, 1, [Define to 1 to compile for gtk2])],
 		[]) ;;
 	*) ;;
 esac
-#GEGL_GTK_API_VERSION=gegl_gtk_api_version
-AC_SUBST(GEGL_GTK_API_VERSION)
+
+AC_SUBST(GEGL_GTK_GTK_VERSION)
 
 AM_CONDITIONAL(HAVE_GTK2, test "$have_gtk" = "2.0")
 AM_CONDITIONAL(HAVE_GTK3, test "$have_gtk" = "3.0")
@@ -264,8 +266,8 @@ Makefile
 gegl-gtk/Makefile
 operations/Makefile
 examples/Makefile
-gegl-gtk-2.0.pc
-gegl-gtk-3.0.pc
+gegl-gtk2-0.1.pc
+gegl-gtk3-0.1.pc
 ])
 
 dnl Print a summary of features enabled/disabled:
diff --git a/gegl-gtk/Makefile.am b/gegl-gtk/Makefile.am
index b162997..a61311e 100644
--- a/gegl-gtk/Makefile.am
+++ b/gegl-gtk/Makefile.am
@@ -1,7 +1,7 @@
 
 headers = gegl-gtk.h gegl-gtk-view.h
 
-gegl_gtk_includedir=$(includedir)/gegl-gtk-$(GEGL_GTK_API_VERSION)
+gegl_gtk_includedir=$(includedir)/gegl-gtk$(GEGL_GTK_GTK_VERSION)-$(GEGL_GTK_API_VERSION)
 gegl_gtk_include_HEADERS = $(headers)
 
 gegl_gtk_SOURCES = $(headers) gegl-gtk-view.c
@@ -9,15 +9,15 @@ gegl_gtk_LIBADD  = $(GTK_LIBS) $(GEGL_LIBS)
 gegl_gtk_CFLAGS  = $(GTK_CFLAGS) $(GEGL_CFLAGS)
 
 if HAVE_GTK2
-lib_LTLIBRARIES = libgegl-gtk-2.0.la
-libgegl_gtk_2_0_la_LIBADD = $(gegl_gtk_LIBADD)
-libgegl_gtk_2_0_la_CFLAGS = $(gegl_gtk_CFLAGS)
-libgegl_gtk_2_0_la_LDFLAGS = $(gegl_gtk_LDFLAGS) -version-info 0:2:0
-libgegl_gtk_2_0_la_SOURCES = $(gegl_gtk_SOURCES)
+lib_LTLIBRARIES = libgegl-gtk2-0.1.la
+libgegl_gtk2_0_1_la_LIBADD = $(gegl_gtk_LIBADD)
+libgegl_gtk2_0_1_la_CFLAGS = $(gegl_gtk_CFLAGS)
+libgegl_gtk2_0_1_la_LDFLAGS = $(gegl_gtk_LDFLAGS) -version-info $(GEGL_GTK_LIBRARY_VERSION)
+libgegl_gtk2_0_1_la_SOURCES = $(gegl_gtk_SOURCES)
 else
-lib_LTLIBRARIES = libgegl-gtk-3.0.la
-libgegl_gtk_3_0_la_LIBADD = $(gegl_gtk_LIBADD)
-libgegl_gtk_3_0_la_CFLAGS = $(gegl_gtk_CFLAGS)
-libgegl_gtk_3_0_la_LDFLAGS = $(gegl_gtk_LDFLAGS) -version-info 0:3:0
-libgegl_gtk_3_0_la_SOURCES = $(gegl_gtk_SOURCES)
+lib_LTLIBRARIES = libgegl-gtk3-0.1.la
+libgegl_gtk3_0_1_la_LIBADD = $(gegl_gtk_LIBADD)
+libgegl_gtk3_0_1_la_CFLAGS = $(gegl_gtk_CFLAGS)
+libgegl_gtk3_0_1_la_LDFLAGS = $(gegl_gtk_LDFLAGS) -version-info $(GEGL_GTK_LIBRARY_VERSION)
+libgegl_gtk3_0_1_la_SOURCES = $(gegl_gtk_SOURCES)
 endif
diff --git a/gegl-gtk-2.0.pc.in b/gegl-gtk2-0.1.pc.in
similarity index 63%
rename from gegl-gtk-2.0.pc.in
rename to gegl-gtk2-0.1.pc.in
index a71b087..c593480 100644
--- a/gegl-gtk-2.0.pc.in
+++ b/gegl-gtk2-0.1.pc.in
@@ -7,5 +7,5 @@ Name: GEGL-GTK
 Description: GTK+ UI convenience library for GEGL
 Version: @GEGL_GTK_REAL_VERSION@
 Requires: gtk+-2.0 gegl babl
-Libs: -L${libdir} -l PACKAGE_NAME@- GEGL_GTK_API_VERSION@
-Cflags: -I${includedir}/@PACKAGE_NAME -@GEGL_GTK_API_VERSION@
+Libs: -L${libdir} -l PACKAGE_NAME@2- GEGL_GTK_API_VERSION@
+Cflags: -I${includedir}/@PACKAGE_NAME 2-@GEGL_GTK_API_VERSION@
diff --git a/gegl-gtk-3.0.pc.in b/gegl-gtk3-0.1.pc.in
similarity index 63%
rename from gegl-gtk-3.0.pc.in
rename to gegl-gtk3-0.1.pc.in
index 293d045..437b00a 100644
--- a/gegl-gtk-3.0.pc.in
+++ b/gegl-gtk3-0.1.pc.in
@@ -7,5 +7,5 @@ Name: GEGL-GTK
 Description: GTK+ UI convenience library for GEGL
 Version: @GEGL_GTK_REAL_VERSION@
 Requires: gtk+-3.0 gegl babl
-Libs: -L${libdir} -l PACKAGE_NAME@- GEGL_GTK_API_VERSION@
-Cflags: -I${includedir}/@PACKAGE_NAME -@GEGL_GTK_API_VERSION@
+Libs: -L${libdir} -l PACKAGE_NAME@3- GEGL_GTK_API_VERSION@
+Cflags: -I${includedir}/@PACKAGE_NAME 3-@GEGL_GTK_API_VERSION@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]