GNOME.org
 

[vte: 267/268] build: API/ABI bump

commit d6e16bc0b52350d7d9ea61826f3f4dddeb607cb0
Author: Christian Persch <chpe gnome org>
Date:   Mon Mar 24 19:26:29 2014 +0100

    build: API/ABI bump

 Makefile.am               |    4 ++--
 configure.ac              |   13 ++++---------
 doc/reference/Makefile.am |    4 ++--
 glade/vte.xml.in.in       |    2 +-
 src/Makefile.am           |   35 +++++++++++++++++------------------
 vte.pc.in                 |    2 +-
 6 files changed, 27 insertions(+), 33 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 53b76ca..f50603d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I .
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
 SUBDIRS = src termcaps po doc perf
 
@@ -19,7 +19,7 @@ SUBDIRS += glade
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vte$(VTE_PC_VERSION).pc
+pkgconfig_DATA = vte-$(VTE_API_VERSION).pc
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
diff --git a/configure.ac b/configure.ac
index a7d8198..9b5e3e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,13 @@ m4_define([version_minor],37)
 m4_define([version_micro],0)
 m4_define([version_triplet],version_major.version_minor.version_micro)
 
-m4_define([so_major_adjust],9) dnl Don't change!
-
 AC_PREREQ([2.63])
 AC_INIT([vte],
         [version_triplet],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=vte],
         [vte])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/vte.c])
 AC_CONFIG_HEADERS([config.h])
 
@@ -28,7 +27,7 @@ AM_MAINTAINER_MODE([enable])
 ################################################################################
 m4_define([lt_revision], m4_if(m4_eval(version_minor%2),1,0,version_micro))
 m4_define([lt_age], m4_eval(version_minor*100+version_micro-lt_revision))
-m4_define([lt_current], m4_eval(so_major_adjust+version_major+lt_age))
+m4_define([lt_current], m4_eval(version_major+lt_age))
 m4_define([lt_triplet],lt_current:lt_revision:lt_age)
 
 LT_VERSION_INFO="lt_triplet()"
@@ -39,10 +38,8 @@ AC_SUBST([LT_VERSION_INFO])
 ################################################################################
 
 VTE_API_MAJOR_VERSION=2
-VTE_API_MINOR_VERSION=90
+VTE_API_MINOR_VERSION=91
 VTE_API_VERSION=$VTE_API_MAJOR_VERSION.$VTE_API_MINOR_VERSION
-VTE_PC_VERSION=-$VTE_API_VERSION
-VTE_LIBRARY_SUFFIX=$VTE_API_VERSION
 VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
 GTK_API_VERSION=3.0
 GTK_REQUIRED=3.2.0
@@ -52,10 +49,8 @@ AC_SUBST([VTE_API_VERSION])
 AC_SUBST([VTE_API_VERSION_U],[AS_TR_SH([$VTE_API_VERSION])])
 AC_SUBST([VTE_API_MAJOR_VERSION])
 AC_SUBST([VTE_API_MINOR_VERSION])
-AC_SUBST([VTE_PC_VERSION])
 AC_SUBST([VTE_SEAL_CFLAGS])
 AC_SUBST([GTK_API_VERSION])
-AC_SUBST([VTE_LIBRARY_SUFFIX_U],[AS_TR_SH([$VTE_LIBRARY_SUFFIX])])
 
 ################################################################################
 
@@ -403,7 +398,7 @@ glade/Makefile
 glade/vte.xml.in
 ])
 
-AC_CONFIG_FILES([vte${VTE_PC_VERSION}.pc:vte.pc.in],[VTE_PC_VERSION=${VTE_PC_VERSION}])
+AC_CONFIG_FILES([vte-${VTE_API_VERSION}.pc:vte.pc.in],[VTE_API_VERSION=${VTE_API_VERSION}])
 
 AC_OUTPUT
 
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 8acccf9..d0b1613 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -104,7 +104,7 @@ HTML_IMAGES =
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files = \
-       version.xml
+       version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -125,7 +125,7 @@ GTKDOC_CFLAGS = \
        $(VTE_CFLAGS)
 
 GTKDOC_LIBS = \
-       $(top_builddir)/src/libvte VTE_LIBRARY_SUFFIX_U@.la \
+       $(top_builddir)/src/libvte- VTE_API_VERSION@.la \
        $(VTE_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/glade/vte.xml.in.in b/glade/vte.xml.in.in
index 7734658..d4ae88f 100644
--- a/glade/vte.xml.in.in
+++ b/glade/vte.xml.in.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glade-catalog name="vte" library="vte VTE_LIBRARY_SUFFIX_U@" domain="vte- VTE_API_VERSION@" depends="gtk+" 
book="vte" supports="gtkbuilder">
+<glade-catalog name="vte" library="vte- VTE_API_VERSION@" domain="vte- VTE_API_VERSION@" depends="gtk+" 
book="vte" supports="gtkbuilder">
   <glade-widget-classes>
     <glade-widget-class title="VTE Terminal" name="VteTerminal" generic-name="terminal">
       <properties>
diff --git a/src/Makefile.am b/src/Makefile.am
index 20dc3a0..817eeb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,9 +7,9 @@ EXTRA_DIST = iso2022.txt
 headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
 header_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h vtedeprecated.h
 
-lib_LTLIBRARIES = libvte VTE_LIBRARY_SUFFIX_U@.la
+lib_LTLIBRARIES = libvte- VTE_API_MAJOR_VERSION@  VTE_API_MINOR_VERSION@.la
 
-EXTRA_libvte VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
+EXTRA_libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        marshal.list \
        mkunitables.sh \
        unitable.CNS11643 \
@@ -28,7 +28,7 @@ EXTRA_libvte VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
        vtetypebuiltins.h.template \
        $(NULL)
 
-libvte VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
+libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        box_drawing.h \
        buffer.h \
        caps.c \
@@ -92,7 +92,7 @@ libvte VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
        vteversion.h
        $(NULL)
 
-libvte VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \
+libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Vte\" \
        -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \
        -DDATADIR='"$(datadir)"' \
@@ -103,10 +103,10 @@ libvte VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \
        -DVTE_COMPILATION \
        $(AM_CPPFLAGS)
 
-libvte VTE_LIBRARY_SUFFIX_U@_la_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
-libvte VTE_LIBRARY_SUFFIX_U@_la_LIBADD = $(VTE_LIBS)
-libvte VTE_LIBRARY_SUFFIX_U@_la_LDFLAGS = \
-  $(VTE_LDFLAGS) \
+libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
+libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_LIBADD = $(VTE_LIBS)
+libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_LDFLAGS = \
+       $(VTE_LDFLAGS) \
        -version-info $(LT_VERSION_INFO) \
        -export-symbols-regex 
"^vte_terminal_.*|^vte_pty_.*|^vte_get_.*|^_vte_pty_.*|^vte_reaper_.*|_vte_debug_.*" \
        @LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@ \
@@ -161,23 +161,23 @@ vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --g
 
 # vte the application
 
-bin_PROGRAMS = vte VTE_LIBRARY_SUFFIX_U@
+bin_PROGRAMS = vte- VTE_API_MAJOR_VERSION@  VTE_API_MINOR_VERSION@
 
-vte VTE_LIBRARY_SUFFIX_U@_SOURCES = \
+vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_SOURCES = \
        vteapp.c \
        $(NULL)
 
-vte VTE_LIBRARY_SUFFIX_U@_CPPFLAGS = \
+vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_CPPFLAGS = \
         -DGLIB_DISABLE_DEPRECATION_WARNINGS \
         -DGDK_DISABLE_DEPRECATION_WARNINGS \
        $(AM_CPPFLAGS)
 
-vte VTE_LIBRARY_SUFFIX_U@_CFLAGS = \
+vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_CFLAGS = \
        $(VTE_CFLAGS) \
        $(AM_CFLAGS)
 
-vte VTE_LIBRARY_SUFFIX_U@_LDADD = \
-       libvte VTE_LIBRARY_SUFFIX_U@.la \
+vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_LDADD = \
+       libvte-$(VTE_API_VERSION).la \
        $(VTE_LIBS)
 
 # introspection
@@ -188,10 +188,10 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
 
-Vte- VTE_API_VERSION@.gir: libvte VTE_LIBRARY_SUFFIX_U@.la
+Vte- VTE_API_VERSION@.gir: libvte-$(VTE_API_VERSION).la
 Vte_ VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
 Vte_ VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(top_srcdir)
-Vte_ VTE_API_VERSION_U@_gir_LIBS = libvte VTE_LIBRARY_SUFFIX_U@.la
+Vte_ VTE_API_VERSION_U@_gir_LIBS = libvte-$(VTE_API_VERSION).la
 Vte_ VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION)
 Vte_ VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
 Vte_ VTE_API_VERSION_U@_gir_FILES = \
@@ -214,7 +214,6 @@ nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
 endif
 
-
 # Misc unit tests and utilities
 
 noinst_PROGRAMS = interpret slowcat
@@ -241,7 +240,7 @@ reflect_text_view_LDADD = $(VTE_LIBS)
 reflect_vte_CPPFLAGS = -DUSE_VTE
 reflect_vte_CFLAGS = $(VTE_CFLAGS)
 reflect_vte_SOURCES = reflect.c
-reflect_vte_LDADD = libvte VTE_LIBRARY_SUFFIX_U@.la $(VTE_LIBS)
+reflect_vte_LDADD = libvte-$(VTE_API_VERSION).la $(VTE_LIBS)
 
 interpret_SOURCES = \
        buffer.h \
diff --git a/vte.pc.in b/vte.pc.in
index c1cabf4..2f40191 100644
--- a/vte.pc.in
+++ b/vte.pc.in
@@ -7,5 +7,5 @@ Name: vte
 Description: Vte terminal widget.
 Version: @VERSION@
 Requires: @VTE_PKGS@
-Libs: -L${libdir} -lvte VTE_LIBRARY_SUFFIX_U@
+Libs: -L${libdir} -lvte- VTE_API_VERSION@
 Cflags: -I${includedir}/vte- VTE_API_VERSION@ @VTE_SEAL_CFLAGS@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]