[beast: 12/24] DATA: include major and minor version in bse-X.Y.pc



commit 82dc554e7a2994716db7bf770065e1b66c476fe1
Author: Tim Janik <timj gnu org>
Date:   Mon Sep 14 10:27:26 2015 +0200

    DATA: include major and minor version in bse-X.Y.pc

 configure.ac     |   15 ++++++++-------
 data/Makefile.am |   12 +++++++++---
 data/bse.pc.in   |   22 ++++++++++++----------
 3 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f92a4da..634b760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ BST_VERSION="$PACKAGE_VERSION"
 [BST_MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\1/'`]
 [BST_MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\2/'`]
 [BST_MICRO_VERSION=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\3/'`]
+[BST_VERSION_STEM="$BST_MAJOR_VERSION.$BST_MINOR_VERSION"]
 [BIN_VERSION=`echo $PACKAGE_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(.*\)/\1.\2.\3/'`]
 case "$BST_VERSION" in
 0.99.*)     BST_VERSION_HINT=BETA ;;
@@ -36,14 +37,15 @@ esac
 AC_DEFINE_UNQUOTED(BST_VERSION, "$BST_VERSION", [BEAST Version])
 AC_DEFINE_UNQUOTED(BIN_VERSION, "$BIN_VERSION", [Binary Version])
 AC_DEFINE_UNQUOTED(BST_VERSION_HINT, "$BST_VERSION_HINT", [Version classification])
-AC_SUBST(BST_VERSION)
-AC_SUBST(BST_MAJOR_VERSION)
-AC_SUBST(BST_MINOR_VERSION)
-AC_SUBST(BST_MICRO_VERSION)
-AC_SUBST(BIN_VERSION)
+AC_SUBST(BST_MAJOR_VERSION)    # 1
+AC_SUBST(BST_MINOR_VERSION)    # 2
+AC_SUBST(BST_MICRO_VERSION)    # 3
+AC_SUBST(BST_VERSION_STEM)     # 1.2
+AC_SUBST(BIN_VERSION)          # 1.2.3
+AC_SUBST(BST_VERSION)          # 1.2.3-rc4
 
 # compute libtool versions
-LT_RELEASE=$BST_MAJOR_VERSION.$BST_MINOR_VERSION
+LT_RELEASE=$BST_VERSION_STEM
 LT_CURRENT=$BST_MICRO_VERSION
 LT_REVISION=0
 LT_AGE=$BST_MICRO_VERSION
@@ -689,7 +691,6 @@ AC_SUBST(LDFLAGS)
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/bse.pc
 data/beast.applications
 sfi/Makefile
 sfi/tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index b81bacd..c5ad20d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,10 +34,16 @@ CLEANFILES += $(noinst_build_sources)
 
 # install pkg-config files
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = bse.pc # sfi.pc
+pkgconfig_DATA = bse- BST_VERSION_STEM@.pc
 $(pkgconfig_DATA): $(top_builddir)/config.status
-CLEANFILES += bse.pc sfi.pc
-EXTRA_DIST += bse.pc.in # sfi.pc.in
+EXTRA_DIST += bse.pc.in
+bse- BST_VERSION_STEM@.pc: bse.pc.in
+CLEANFILES += bse- BST_VERSION_STEM@.pc
+bse- BST_VERSION_STEM@.pc: bse.pc.in
+       $(AM_V_GEN)
+       $(Q) cp $(srcdir)/bse.pc.in $  in
+       $(Q) cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
+       $(Q) rm -f $  in
 
 # install .applications files
 dotapplicationsdir = $(datadir)/application-registry
diff --git a/data/bse.pc.in b/data/bse.pc.in
index 41df3c4..521cd3c 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -1,21 +1,23 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
+datarootdir= datarootdir@
 datadir= datadir@
 includedir= includedir@
+pkgincludedir= pkgincludedir@
 
 sfidl= exec_prefix@/sfidl
-demodir= bsedemodir@
-sampledir= bsesampledir@
-scriptdir= bsescriptdir@
-plugindir= bseplugindir@
-driverdir= bsedriverdir@
-effectdir= bseeffectdir@
-instrumentdir= bseinstrumentdir@
+demodir= pkgdatadir@/demo
+sampledir= pkgdatadir@/samples
+scriptdir= pkgdatadir@/scripts
+plugindir= pkglibdir@/plugins
+driverdir= pkglibdir@/drivers
+effectdir= pkgdatadir@/effects
+instrumentdir= pkgdatadir@/instruments
 
 Name: BSE
 Description: Better Sound Engine (Synthesis Core)
 Requires: @BSE_PC_REQUIRE@ gobject-2.0 gmodule-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lbse @BSE_PC_LIBS@
-Cflags: -I${includedir} @BSE_PC_CFLAGS@
+Version: @BST_VERSION@
+Libs: -L${libdir} -lbse- BST_VERSION_STEM@ @BSE_PC_LIBS@
+Cflags: -I${pkgincludedir} @BSE_PC_CFLAGS@


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