GNOME.org
 

[libgrss/wip/GrssPerson] bump version to 0.7

commit 88f7ce2917618df7092be16d4585edd20a890712
Author: Igor Gnatenko <ignatenko src gnome org>
Date:   Sat Jul 18 22:39:13 2015 +0300

    bump version to 0.7
    
    Signed-off-by: Igor Gnatenko <ignatenko src gnome org>

 AUTHORS                   |    1 +
 Makefile.am               |    7 +----
 configure.ac              |   53 ++++++++++++++++++++++++++++++++------------
 doc/reference/Makefile.am |    4 +-
 libgrss.pc.in             |    4 +-
 src/Makefile.am           |   33 ++++++++++++++++------------
 src/tests/Makefile.am     |    2 +-
 7 files changed, 65 insertions(+), 39 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index fbf49bb..707d6a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 # Generated by Makefile. Do not edit.
 
+Carlos Garnacho
 Gilles Dartiguelongue
 Heinrich Müller
 Igor Gnatenko
diff --git a/Makefile.am b/Makefile.am
index d25a980..567d613 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src doc
 EXTRA_DIST = AUTHORS
-CLEANFILES = libgrss-$(LIBGRSS_API_VERSION).pc
+CLEANFILES = libgrss.pc
 
 pcfiledir = $(libdir)/pkgconfig
-pcfile_DATA = libgrss-$(LIBGRSS_API_VERSION).pc
+pcfile_DATA = libgrss.pc
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
@@ -30,9 +30,6 @@ GITIGNOREFILES = \
        tap-driver.sh \
        $(NULL)
 
-libgrss-$(LIBGRSS_API_VERSION).pc: libgrss.pc
-       @cp -f $< $@
-
 AUTHORS:
        @if test -d "$(srcdir)/.git"; \
        then \
diff --git a/configure.ac b/configure.ac
index 2023b01..ae71c00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,29 @@
-AC_PREREQ(2.62)
-
+# bump micro_version to the next even number for each point release
+# bump micro_version to the next odd number after each release
 m4_define([grss_major_version], [0])
-m4_define([grss_minor_version], [6])
+m4_define([grss_minor_version], [7])
 m4_define([grss_micro_version], [0])
-m4_define([grss_api_version], [0.6])
 m4_define([grss_version],
           [grss_major_version.grss_minor_version.grss_micro_version])
 m4_define([grss_bugreport_url],
           [https://bugzilla.gnome.org/enter_bug.cgi?product=libgrss])
 
-AC_INIT([libgrss], [grss_version], [grss_bugreport_url])
+# bump up by 1 for every micro release with no API changes, otherwise
+# set to 0. after release, bump up by 1
+m4_define([grss_interface_age], [0])
+m4_define([grss_binary_age], [m4_eval(100 * grss_minor_version + grss_micro_version)])
+
+m4_define([lt_current], [m4_eval(100 * grss_minor_version + grss_micro_version - grss_interface_age)])
+m4_define([lt_revision], [grss_interface_age])
+m4_define([lt_age], [m4_eval(grss_binary_age - grss_interface_age)])
+
+AC_PREREQ(2.62)
+
+AC_INIT([libgrss],
+        [grss_version],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=libgrss],
+        [libgrss],
+        [https://wiki.gnome.org/Projects/Libgrss])
 
 AC_CONFIG_HEADERS(config.h)
 
@@ -18,25 +32,34 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
-GNOME_MAINTAINER_MODE_DEFINES
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
+AC_PROG_CC
+
+dnl === Versioning ============================================================
 
 GRSS_MAJOR_VERSION=grss_major_version
 GRSS_MINOR_VERSION=grss_minor_version
 GRSS_MICRO_VERSION=grss_micro_version
-LIBGRSS_API_VERSION=grss_api_version
-LIBGRSS_VERSION=grss_version
+GRSS_VERSION=grss_version
+GRSS_RELEASE_STATUS=grss_release_status
 AC_SUBST(GRSS_MAJOR_VERSION)
-AC_SUBST(GRSS_MINOR_VERSION)
 AC_SUBST(GRSS_MICRO_VERSION)
-AC_SUBST(LIBGRSS_API_VERSION)
-AC_SUBST(LIBGRSS_VERSION)
+AC_SUBST(GRSS_MINOR_VERSION)
+AC_SUBST(GRSS_VERSION)
+AC_SUBST(GRSS_RELEASE_STATUS)
 
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen disable-static])
+GRSS_LT_CURRENT=lt_current
+GRSS_LT_REVISION=lt_revision
+GRSS_LT_AGE=lt_age
+GRSS_LT_VERSION="$GRSS_LT_CURRENT:$GRSS_LT_REVISION:$GRSS_LT_AGE"
+GRSS_LT_LDFLAGS="-version-info $GRSS_LT_VERSION"
 
-AC_PROG_CC
+AC_SUBST(GRSS_LT_LDFLAGS)
 
-GNOME_COMPILE_WARNINGS([maximum])
+# FIXME: enable in the future
+#AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
 
 AC_ARG_ENABLE(deprecation_flags,
               [AC_HELP_STRING([--enable-deprecation-flags],
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 2b62b6a..7823a7e 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -7,7 +7,7 @@
 DOC_MODULE=libgrss
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-DOC_MODULE_VERSION= LIBGRSS_API_VERSION@
+#DOC_MODULE_VERSION=
 
 # The top-level XML file.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -68,7 +68,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-I$(top_srcdir) $(LIBGRSS_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/src/libgrss- LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
+GTKDOC_LIBS=$(top_builddir)/src/libgrss.la $(LIBGRSS_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/libgrss.pc.in b/libgrss.pc.in
index 3d75924..7a78d96 100644
--- a/libgrss.pc.in
+++ b/libgrss.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: libgrss
 Description: GObject RSS handling library
 Version: @VERSION@
-Libs: -L${libdir} -lgrss- LIBGRSS_API_VERSION@
-Cflags: -I${includedir}/libgrss- LIBGRSS_API_VERSION@
+Libs: -L${libdir} -lgrss
+Cflags: -I${includedir}/libgrss
 Requires: gobject-2.0 libxml-2.0 libsoup-2.4
diff --git a/src/Makefile.am b/src/Makefile.am
index b821386..eaf53c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,15 +2,16 @@ SUBDIRS = tests
 
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src         \
        -DPREFIX=\""$(prefix)"\"    \
        -DLIBDIR=\""$(libdir)"\"    \
        -DG_DISABLE_DEPRECATED      \
+       $(WARN_CFLAGS)              \
        $(LIBGRSS_CFLAGS)           \
        $(NULL)
 
-LDADD = $(LIBGRSS_LT_LDFLAGS) -export-dynamic -rpath $(libdir)
+LDADD = -export-dynamic -rpath $(libdir)
 
 sources_private_h = \
        feed-atom-handler.h             \
@@ -86,19 +87,23 @@ feed-marshal.c: feed-marshal.list
        echo "#include \"feed-marshal.h\"" > $@ &&    \
                $(GLIB_GENMARSHAL) $< --prefix=feed_marshal --body >> $@
 
-lib_LTLIBRARIES = libgrss-0.6.la
+lib_LTLIBRARIES = libgrss.la
 
-libgrss_0_6_la_LIBADD = $(LIBGRSS_LIBS)
-libgrss_0_6_la_SOURCES = \
+libgrss_la_LIBADD = $(LIBGRSS_LIBS)
+libgrss_la_SOURCES = \
        $(sources_public_h) \
        $(sources_private_h) \
        $(sources_public_c) \
        $(sources_private_c) \
        $(NULL)
-libgrss_0_6_la_LDFLAGS = $(LDADD)
+libgrss_la_LDFLAGS = \
+       $(GRSS_LT_LDFLAGS) \
+       $(WARN_LDFLAGS) \
+       $(LDADD) \
+       $(NULL)
 
-libgrss_0_6_ladir = $(includedir)/libgrss- LIBGRSS_API_VERSION@
-libgrss_0_6_la_HEADERS = $(sources_public_h)
+libgrss_ladir = $(includedir)/libgrss
+libgrss_la_HEADERS = $(sources_public_h)
 
 CLEANFILES = $(pcfile_DATA)
 
@@ -121,12 +126,12 @@ introspection_sources = \
        $(sources_public_c) \
        $(NULL)
 
-Grss-0.6.gir: libgrss-0.6.la
-Grss_0_6_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0
-Grss_0_6_gir_CFLAGS = $(INCLUDES)
-Grss_0_6_gir_LIBS = libgrss-0.6.la
-Grss_0_6_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += Grss-0.6.gir
+Grss-0.7.gir: libgrss.la
+Grss_0_7_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0
+Grss_0_7_gir_CFLAGS = $(INCLUDES)
+Grss_0_7_gir_LIBS = libgrss.la
+Grss_0_7_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Grss-0.7.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index fb8c92d..4fafe0c 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/glib-tap.mk
 
 AM_CFLAGS = -g $(LIBGRSS_CFLAGS)
-LDADD = $(top_builddir)/src/libgrss- LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
+LDADD = $(top_builddir)/src/libgrss.la $(LIBGRSS_LIBS)
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        $(NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]