[vinagre] Let configure update and rename pkg-config file



commit 3ac00e52a2a3b9dd60bb28a575481c968b78c96b
Author: David King <amigadave amigadave com>
Date:   Wed Mar 9 17:53:13 2011 +0100

    Let configure update and rename pkg-config file

 Makefile.am        |    5 +----
 configure.ac       |    6 +++---
 data/vinagre.pc.in |    4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f0b53d..6dacecd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,10 +350,7 @@ uninstall-update-icon-cache:
 dist_man_MANS = data/vinagre.1
 
 pkgconfigdir = $(libdir)/pkgconfig
-nodist_pkgconfig_DATA = data/vinagre- VINAGRE_API_VERSION@.pc
-
-data/vinagre- VINAGRE_API_VERSION@.pc: data/vinagre.pc
-	$(AM_V_GEN)cp $< $@
+pkgconfig_DATA = data/vinagre- VINAGRE_ABI_VERSION@.pc
 
 dist_pkgdata_DATA = \
 	data/vinagre-ui.xml \
diff --git a/configure.ac b/configure.ac
index 08aedf7..9aeb47c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@ PKG_PROG_PKG_CONFIG([0.16])
 AC_PROG_SED
 
 # TODO: Bump before release with GTK+ 3 support.
-# TODO: Use in name of pkg-config file, plugin path and where appropriate.
-AC_SUBST([VINAGRE_API_VERSION], [1.0])
+# TODO: Use in plugin path and where appropriate.
+AC_SUBST([VINAGRE_ABI_VERSION], [1.0])
 
 AC_SUBST([PLUGIN_LIBTOOL_FLAGS], ["-module -avoid-version"])
 AC_SUBST([VINAGRE_PLUGINS_DATA_DIR], ["$datadir/vinagre-1/plugins"])
@@ -277,7 +277,7 @@ AC_CONFIG_FILES([
 Makefile
 data/vinagre.desktop.in
 data/vinagre-file.desktop.in
-data/vinagre.pc
+data/vinagre-${VINAGRE_ABI_VERSION}.pc:data/vinagre.pc.in
 help/Makefile
 po/Makefile.in
 plugins/Makefile
diff --git a/data/vinagre.pc.in b/data/vinagre.pc.in
index 77d1916..11bf024 100644
--- a/data/vinagre.pc.in
+++ b/data/vinagre.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: vinagre
 Description: vinagre
 Requires: gtk+-3.0 libxml-2.0
-Version: @VERSION@
-Cflags: -I${includedir}/vinagre- VINAGRE_API_VERSION@
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}/vinagre- VINAGRE_ABI_VERSION@
 Libs:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]