[vte/vte-next] build: Remove VTE_PC_VERSION define
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-next] build: Remove VTE_PC_VERSION define
- Date: Mon, 31 Oct 2011 13:11:52 +0000 (UTC)
commit 1d3ce11cc405cbb2ce3640c737ee260ba742cf8a
Author: Christian Persch <chpe gnome org>
Date: Mon Oct 31 14:10:38 2011 +0100
build: Remove VTE_PC_VERSION define
It's now always equal to VTE_API_VERSION, so just use that.
Makefile.am | 2 +-
configure.in | 6 ++----
src/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 53b76ca..e5ca842 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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.in b/configure.in
index 5332f1f..40f185f 100644
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,6 @@ case "$with_gtk" in
3.0) VTE_API_VERSION=2.91
VTE_API_MAJOR_VERSION=2
VTE_API_MINOR_VERSION=91
- VTE_PC_VERSION=-$VTE_API_VERSION
VTE_LIBRARY_SUFFIX=$VTE_API_VERSION
GTK_API_VERSION=3.0
GTK_REQUIRED=3.0.0
@@ -63,7 +62,6 @@ 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([GTK_API_VERSION])
AC_SUBST([VTE_LIBRARY_SUFFIX_U],[AS_TR_SH([$VTE_LIBRARY_SUFFIX])])
@@ -387,8 +385,8 @@ doc/reference/version.xml
glade/Makefile
])
-AC_CONFIG_FILES([vte${VTE_PC_VERSION}.pc:vte.pc.in],[VTE_PC_VERSION=${VTE_PC_VERSION}])
-AC_CONFIG_FILES([vte${VTE_PC_VERSION}-uninstalled.pc:vte-uninstalled.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_CONFIG_FILES([vte-${VTE_API_VERSION}-uninstalled.pc:vte-uninstalled.pc.in],[VTE_API_VERSION=${VTE_API_VERSION}])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a7b6ac..98e26e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,7 @@ if HAVE_INTROSPECTION
Vte- VTE_API_VERSION@.gir: libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@.la
-Vte_ VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte$(VTE_PC_VERSION)
+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_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) -I$(top_builddir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]