[beast: 2/9] DATA: generate and install unversioned bse.pc



commit 4a6f145d199aed07011f28e4d29affbe5f08c97e
Author: Tim Janik <timj gnu org>
Date:   Tue Oct 27 18:04:57 2015 +0100

    DATA: generate and install unversioned bse.pc
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am      |    4 ++--
 data/Makefile.am |   12 ++++--------
 data/bse.pc.in   |    2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 63c98ab..502201b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,9 +37,9 @@ bse-app-test:
        && echo '  Bse::init_async (&argc, argv, "bse-app-test");'      >> tmpx.cc \
        && echo '  return 0; }'                                         >> tmpx.cc \
                ; X=$$? ; echo -n "Create  BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
-       $(Q) $(CXX) -Werror tmpx.cc -c `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config 
--cflags bse- MAJOR@` \
+       $(Q) $(CXX) -Werror tmpx.cc -c `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config 
--cflags bse` \
                ; X=$$? ; echo -n "Compile BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
-       $(Q) $(CXX) -Werror tmpx.o -o tmpx `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" 
pkg-config --libs bse- MAJOR@` \
+       $(Q) $(CXX) -Werror tmpx.o -o tmpx `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" 
pkg-config --libs bse` \
                ; X=$$? ; echo -n "Link    BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
        $(Q) LD_LIBRARY_PATH="$(libdir):$$LD_LIBRARY_PATH" ./tmpx \
                ; X=$$? ; echo -n "Execute BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
diff --git a/data/Makefile.am b/data/Makefile.am
index 228ee93..55bd359 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,16 +34,12 @@ CLEANFILES += $(noinst_build_sources)
 
 # install pkg-config files
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = bse- MAJOR@.pc
-$(pkgconfig_DATA): $(top_builddir)/config.status
-EXTRA_DIST += bse.pc.in
-bse- MAJOR@.pc: bse.pc.in
-CLEANFILES += bse- MAJOR@.pc
-bse- MAJOR@.pc: bse.pc.in
+pkgconfig_DATA = bse.pc # bse- MAJOR@.pc
+bse.pc: bse.pc.in $(top_builddir)/config.status
        $(AM_V_GEN)
-       $(Q) cp $(srcdir)/bse.pc.in $  in
        $(Q) cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
-       $(Q) rm -f $  in
+EXTRA_DIST += bse.pc.in
+CLEANFILES += bse.pc
 
 # install .applications files
 dotapplicationsdir = $(datadir)/application-registry
diff --git a/data/bse.pc.in b/data/bse.pc.in
index 4dfe030..df7d4e5 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -17,7 +17,7 @@ instrumentdir= pkgdatadir@/instruments
 
 Name: Beast & Bse
 Description: Beast & Bse are an audio tracker and audio synthesis engine.
-Requires: @BSE_PC_REQUIRE@ gobject-2.0 gmodule-2.0 rapicorn-15
+Requires: @BSE_PC_REQUIRE@ gobject-2.0 gmodule-2.0 rapicorn
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lbse- MAJOR@ @BSE_PC_LIBS@
 Cflags: -I${pkgincludedir} @BSE_PC_CFLAGS@


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