[beast: 4/12] BUILD: strip MINOR from install paths and generally use 'beast- MAJOR@' scheme

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast: 4/12] BUILD: strip MINOR from install paths and generally use 'beast- MAJOR@' scheme
Date: Mon, 2 Nov 2015 19:26:31 +0000 (UTC)
commit 3ec0571dcb20233ebfe89cc86ee17728afff3fe5
Author: Tim Janik <timj gnu org>
Date:   Mon Oct 19 23:40:37 2015 +0200

    BUILD: strip MINOR from install paths and generally use 'beast- MAJOR@' scheme
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/Makefile.am         |   10 ++++----
 beast-gtk/gxk/Makefile.am     |    2 +-
 bse/Makefile.am               |   42 +++++++++++++++++++---------------------
 bse/tests/Makefile.am         |    2 +-
 data/Makefile.am              |    8 +++---
 data/bse.pc.in                |    6 ++--
 drivers/Makefile.am           |    2 +-
 plugins/Makefile.am           |    2 +-
 plugins/evaluator/Makefile.am |    2 +-
 plugins/freeverb/Makefile.am  |    2 +-
 sfi/Makefile.am               |   12 +++++-----
 sfi/tests/Makefile.am         |    2 +-
 shell/Makefile.am             |    8 +++---
 tests/Makefile.am             |    2 +-
 tests/bse/Makefile.am         |    4 +-
 tests/latency/Makefile.am     |    2 +-
 tools/Makefile.am             |    2 +-
 17 files changed, 54 insertions(+), 56 deletions(-)
---
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 0cd5d30..63ebf81 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -133,12 +133,12 @@ generated: clean-generated $(GENERATED)
 #
 # build rules for programs
 #
-bin_PROGRAMS = beast- BIN_VERSION@
-beast_ BIN_VERSION@_SOURCES = $(bst_cc_sources) bstmain.cc
-beast_ BIN_VERSION@_LDADD = $(progs_LDADD)
-beast_build_objects = $(beast_ BIN_VERSION@_OBJECTS) # dependency for generated sources
+bin_PROGRAMS = beast- MAJOR@
+beast_ MAJOR@_SOURCES = $(bst_cc_sources) bstmain.cc
+beast_ MAJOR@_LDADD = $(progs_LDADD)
+beast_build_objects = $(beast_ MAJOR@_OBJECTS) # dependency for generated sources
 noinst_PROGRAMS = $(ALLTESTS)
-progs_LDADD     = $(BEAST_LIBS) ./gxk/libgxk.a $(GXK_LIBS) $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) 
$(BSE_LIBS)
+progs_LDADD     = $(BEAST_LIBS) ./gxk/libgxk.a $(GXK_LIBS) $(top_builddir)/bse/libbse- MAJOR@.la 
$(RAPICORN_LIBS) $(BSE_LIBS)
 
 noinst_PROGRAMS += tsmview
 tsmview_SOURCES  = tsmview.cc
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index c3d2f7f..521df67 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -113,7 +113,7 @@ libgxk_a_SOURCES = $(gxk_c_sources)
 noinst_PROGRAMS = $(ALLTESTS)
 progs_LDADD     = $(strip                                      \
        libgxk.a $(GXK_LIBS)                                    \
-       $(top_builddir)/sfi/libsfi.la $(SFI_LIBS)               \
+       $(top_builddir)/sfi/libsfi- MAJOR@.la $(SFI_LIBS)       \
        $(RAPICORN_LIBS) $(BIRNET_LIBS)                         \
 )
 
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 3668938..8205d44 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -135,18 +135,16 @@ EXTRA_DIST += $(strip \
 #
 # BSE library
 #
-lib_LTLIBRARIES              = libbse.la
-libbseincludedir                    = $(pkgincludedir)/bse
-libbseinclude_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl 
$(idl_dummy_files)
-nodist_libbseinclude_HEADERS = bsebasics.genidl.hh
-libbse_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
-libbse_la_LIBADD             = $(top_builddir)/sfi/libsfi.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
-libbse_la_LDFLAGS            = $(strip                         \
-       -Wl,--version-script=$(srcdir)/ldscript.map             \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-       -release $(LT_RELEASE)                                  \
-       -no-undefined                                           \
-       $(AM_LDFLAGS)                                           \
+lib_LTLIBRARIES                      = libbse- MAJOR@.la
+libbse_ MAJOR@includedir             = $(includedir)/bse- MAJOR@/bse
+libbse_ MAJOR@include_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl 
$(idl_dummy_files)
+nodist_libbse_ MAJOR@include_HEADERS = bsebasics.genidl.hh
+libbse_ MAJOR@_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
+libbse_ MAJOR@_la_LIBADD             = $(top_builddir)/sfi/libsfi- MAJOR@.la $(BSE_LIBS) $(SFI_LIBS) 
$(RAPICORN_LIBS)
+libbse_ MAJOR@_la_LDFLAGS            = $(strip         \
+       $(AM_LDFLAGS) -no-undefined                     \
+       -Wl,--version-script=$(srcdir)/ldscript.map     \
+       -version-info $(LT_VERSION_INFO)                \
 )
 EXTRA_DIST += ldscript.map
 #      -Wl,-Bsymbolic
@@ -186,7 +184,7 @@ $(srcdir)/gslfft.cc: @PERLRULE@ $(srcdir)/gsl-fftgen.pl $(srcdir)/gsl-fftconf.sh
 # bsegentypes.h
 mktypes_bse_sources = $(filter-out bsegentypes.cc gslfft.cc, $(bse_sources))
 GENERATED_EXTRA_DIST += bsegentypes.h
-bsetype.hh $(bse_sources): bsegentypes.h       # $(libbse_la_OBJECTS): bsegentypes.h
+bsetype.hh $(bse_sources): bsegentypes.h       # $(libbse_ MAJOR@_la_OBJECTS): bsegentypes.h
 bsegentypes.h: @PERLRULE@ mktypes.pl # $(filter-out bsegentypes.cc gslfft.cc, $(bse_sources)) $(filter-out 
bsegentypes.h, $(bse_public_headers))
 bsegentypes.h: @PERLRULE@ bsebasics.idl # $(SFIDL)
        $(AM_V_GEN)
@@ -203,7 +201,7 @@ bsegentypes.h: @PERLRULE@ bsebasics.idl # $(SFIDL)
        && mv xgen-$(@F) $(srcdir)/bsegentypes.h
 # bsegentypes.cc
 GENERATED_EXTRA_DIST += bsegentypes.cc
-$(libbse_la_OBJECTS): bsegentypes.cc
+$(libbse_ MAJOR@_la_OBJECTS): bsegentypes.cc
 bsegentypes.cc: @PERLRULE@ bsegentypes.h mktypes.pl bsebasics.idl # $(SFIDL)
        $(AM_V_GEN)
        $(Q) ( \
@@ -217,7 +215,7 @@ bsegentypes.cc: @PERLRULE@ bsegentypes.h mktypes.pl bsebasics.idl # $(SFIDL)
        && rm -f xgen-$(@F)
 # bseenum_arrays.cc
 GENERATED_CLEANFILES += bseenum_arrays.cc
-$(libbse_la_OBJECTS): bseenum_arrays.cc
+$(libbse_ MAJOR@_la_OBJECTS): bseenum_arrays.cc
 bseenum_arrays.cc: bsegentypes.h
        $(AM_V_GEN)
        $(Q) ( \
@@ -234,7 +232,7 @@ bseenum_arrays.cc: bsegentypes.h
        && rm -f xgen-$(@F)
 # bseenum_list.cc
 GENERATED_CLEANFILES += bseenum_list.cc
-$(libbse_la_OBJECTS): bseenum_list.cc
+$(libbse_ MAJOR@_la_OBJECTS): bseenum_list.cc
 bseenum_list.cc: bsegentypes.h
        $(AM_V_GEN)
        $(Q) ( \
@@ -248,7 +246,7 @@ bseenum_list.cc: bsegentypes.h
        && rm -f xgen-$(@F)
 # bsegentype_array.cc
 GENERATED_EXTRA_DIST += bsegentype_array.cc
-$(libbse_la_OBJECTS): bsegentype_array.cc
+$(libbse_ MAJOR@_la_OBJECTS): bsegentype_array.cc
 bsegentype_array.cc: @PERLRULE@ bsegentypes.h
        $(AM_V_GEN)
        $(Q) cd $(srcdir) \
@@ -257,7 +255,7 @@ bsegentype_array.cc: @PERLRULE@ bsegentypes.h
        && rm -f xgen-$(@F)
 # bsebuiltin_externs.cc
 GENERATED_EXTRA_DIST += bsebuiltin_externs.cc
-#$(libbse_la_OBJECTS): bsebuiltin_externs.cc # forces complete rebuild when *.proc changes
+#$(libbse_ MAJOR@_la_OBJECTS): bsebuiltin_externs.cc # forces complete rebuild when *.proc changes
 bseplugin.cc: bsebuiltin_externs.cc
 bsebuiltin_externs.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
        $(AM_V_GEN)
@@ -267,7 +265,7 @@ bsebuiltin_externs.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
        && rm -f xgen-$(@F)
 # bsebuiltin_array.cc
 GENERATED_EXTRA_DIST += bsebuiltin_array.cc
-#$(libbse_la_OBJECTS): bsebuiltin_array.cc # forces complete rebuild when *.proc changes
+#$(libbse_ MAJOR@_la_OBJECTS): bsebuiltin_array.cc # forces complete rebuild when *.proc changes
 bseplugin.cc: bsebuiltin_array.cc
 bsebuiltin_array.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
        $(AM_V_GEN)
@@ -336,7 +334,7 @@ EXTRA_DIST += bseapi.idl
 
 # == GENERATED targets ==
 CLEANFILES += $(GENERATED)
-$(libbse_la_OBJECTS): $(GENERATED)     # needed dependency to force file generation
+$(libbse_ MAJOR@_la_OBJECTS): $(GENERATED)     # needed dependency to force file generation
 $(bseprocidl_OBJECTS) $(bsetool_OBJECTS): $(GENERATED)
 
 #
@@ -350,7 +348,7 @@ all: # TAGS
 # other programs, we want to compile
 #
 noinst_PROGRAMS = $(ALLTESTS)
-progs_LDADD = libbse.la $(RAPICORN_LIBS) $(SFI_LIBS) -lm
+progs_LDADD = libbse- MAJOR@.la $(RAPICORN_LIBS) $(SFI_LIBS) -lm
 # source files
 
 noinst_PROGRAMS   += bseprocidl
@@ -360,7 +358,7 @@ bseprocidl_LDADD   = $(progs_LDADD)
 # == bsetool ==
 noinst_PROGRAMS += bsetool
 bsetool_SOURCES  = bsetool.cc
-bsetool_LDADD    = libbse.la $(RAPICORN_LIBS)
+bsetool_LDADD    = libbse- MAJOR@.la $(RAPICORN_LIBS)
 
 # == Tests ==
 EXTRA_DIST += oldidl.idl
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index 22dc761..3497bc6 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -10,7 +10,7 @@ AM_CXXFLAGS += $(BSE_CFLAGS) $(SFI_CPPFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVE
 EXTRA_DIST += arrows.gp filter-defs.gp
 
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd     = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
+progs_ldadd     = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS)
 
 TESTS            += misctests
 misctests_SOURCES = misctests.cc
diff --git a/data/Makefile.am b/data/Makefile.am
index 9143858..228ee93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,12 +34,12 @@ CLEANFILES += $(noinst_build_sources)
 
 # install pkg-config files
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = bse- BST_VERSION_STEM@.pc
+pkgconfig_DATA = bse- MAJOR@.pc
 $(pkgconfig_DATA): $(top_builddir)/config.status
 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
+bse- MAJOR@.pc: bse.pc.in
+CLEANFILES += bse- MAJOR@.pc
+bse- MAJOR@.pc: bse.pc.in
        $(AM_V_GEN)
        $(Q) cp $(srcdir)/bse.pc.in $  in
        $(Q) cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
diff --git a/data/bse.pc.in b/data/bse.pc.in
index 50287cb..bd7fee5 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -4,7 +4,7 @@ libdir= libdir@
 datarootdir= datarootdir@
 datadir= datadir@
 includedir= includedir@
-pkgincludedir= pkgincludedir@
+pkgincludedir= includedir@/bse- MAJOR@
 
 sfidl= exec_prefix@/sfidl
 demodir= pkgdatadir@/demo
@@ -18,6 +18,6 @@ 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
-Version: @BST_VERSION@
-Libs: -L${libdir} -lbse- BST_VERSION_STEM@ @BSE_PC_LIBS@
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lbse- MAJOR@ @BSE_PC_LIBS@
 Cflags: -I${pkgincludedir} @BSE_PC_CFLAGS@
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index a8c12f8..0e111c9 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -9,7 +9,7 @@ AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 driversdir          = $(pkglibdir)/drivers
 drivers_LTLIBRARIES = bsepcmdevice-alsa.la bsemididevice-alsa.la
 drivers_ldflags     = -avoid-version
-drivers_libs        = $(top_builddir)/bse/libbse.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
+drivers_libs        = $(top_builddir)/bse/libbse- MAJOR@.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
 
 # Plugin bsepcmdevice-alsa
 bsepcmdevice_alsa_la_SOURCES = bsepcmdevice-alsa.cc
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a037d5b..1e5c389 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -56,7 +56,7 @@ UNPORTED = $(strip            \
 
 # === plugin build rule setup ===
 plugins_ldflags          = -avoid-version
-plugins_libs             = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
+plugins_libs             = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
 plugins_built_sources    =     # listed in Makefile.plugins
 CLEANFILES              += $(plugins_built_sources)
 # .FPU plugins
diff --git a/plugins/evaluator/Makefile.am b/plugins/evaluator/Makefile.am
index d01632a..fb0be34 100644
--- a/plugins/evaluator/Makefile.am
+++ b/plugins/evaluator/Makefile.am
@@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.decl
 #
 #bseevaluator_la_SOURCES = bseevaluator.cc $(EVALUATE_SOURCES)
 #bseevaluator_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-#bseevaluator_la_LIBADD  = $(top_builddir)/bse/libbse.la $(top_builddir)/sfi/libsfi.la $(BSE_LIBS) -lm
+#bseevaluator_la_LIBADD  = $(top_builddir)/bse/libbse- MAJOR@.la $(BSE_LIBS) -lm
 #plugins_built_sources += bseevaluator.genidl.hh
 #EXTRA_HEADERS += bseevaluator.idl symbols.hh token.hh instruction.hh compiler.hh cpu.hh
 #$(bseevaluator_la_OBJECTS): bseevaluator.genidl.hh
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 26e7a76..7125860 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -10,7 +10,7 @@ plugindir = $(pkglibdir)/plugins
 
 freeverb_la_SOURCES = allpass.cpp comb.cpp revmodel.cpp bsefreeverbcpp.cpp bsefreeverb.cc
 freeverb_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-freeverb_la_LIBADD  = $(top_builddir)/bse/libbse.la $(BSE_LIBS) -lm
+freeverb_la_LIBADD  = $(top_builddir)/bse/libbse- MAJOR@.la $(BSE_LIBS) -lm
 
 plugin_LTLIBRARIES = freeverb.la
 
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index a9cf4b8..fa2201f 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -34,12 +34,12 @@ sfi_built_sources = $(strip \
 $(sfi_all_sources): $(sfi_built_sources)
 
 # SFI library
-noinst_LTLIBRARIES    = libsfi.la
-libsfiincludedir      = $(pkgincludedir)/sfi
-libsfiinclude_HEADERS = $(sfi_public_headers)
-libsfi_la_SOURCES     = $(sfi_all_sources)
-libsfi_la_LDFLAGS     = $(AM_LDFLAGS) -no-undefined # -Wl,-Bsymbolic
-libsfi_la_LIBADD      = $(SFI_LIBS) -lm
+noinst_LTLIBRARIES            = libsfi- MAJOR@.la
+libsfi_ MAJOR@includedir      = $(includedir)/bse- MAJOR@/sfi
+libsfi_ MAJOR@include_HEADERS = $(sfi_public_headers)
+libsfi_ MAJOR@_la_SOURCES     = $(sfi_all_sources)
+libsfi_ MAJOR@_la_LIBADD      = $(SFI_LIBS) -lm
+libsfi_ MAJOR@_la_LDFLAGS     = $(AM_LDFLAGS) -no-undefined -version-info $(LT_VERSION_INFO)
 
 #
 # programs to build
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index 19191fb..66839f3 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -7,7 +7,7 @@ AM_CXXFLAGS += $(SFI_CPPFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS   = $(ALLTESTS)
 progs_nosfi_ldadd = $(RAPICORN_LIBS) $(SFI_LIBS) -lm
-progs_ldadd      = $(top_builddir)/sfi/libsfi.la $(RAPICORN_LIBS) $(SFI_LIBS) -lm
+progs_ldadd      = $(top_builddir)/sfi/libsfi- MAJOR@.la $(RAPICORN_LIBS) $(SFI_LIBS) -lm
 SFIDL            = $(top_builddir)/sfi/sfidl
 
 # ring
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 21d20b1..b648771 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -16,14 +16,14 @@ gen_sources = xgen-bsggc
 CLEANFILES += $(gen_sources)
 
 # libraries to link programs against
-programs_ldadd = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS)
+programs_ldadd = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS)
 
 #
 # programs to build
 #
-bin_PROGRAMS = bsescm-$(BIN_VERSION)           # this expands to bsescm-0.7.0 or similar
-bsescm___BIN_VERSION__SOURCES = bsescm.cc bsescminterp.cc
-bsescm___BIN_VERSION__LDADD = $(programs_ldadd) $(BSESCM_LIBS)
+bin_PROGRAMS = bsescm- MAJOR@          # this expands to bsescm-0
+bsescm_ MAJOR@_SOURCES = bsescm.cc bsescminterp.cc
+bsescm_ MAJOR@_LDADD = $(programs_ldadd) $(BSESCM_LIBS)
 
 # source setups
 bsescminterp.cc: # bsescm-genglue.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d55425f..0b6ea40 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,7 +22,7 @@ generated: clean-generated $(GENERATED)
 
 # === test programs ===
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd     = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
+progs_ldadd     = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS)
 
 # testwavechunk
 TESTS                += testwavechunk
diff --git a/tests/bse/Makefile.am b/tests/bse/Makefile.am
index 8a6d147..7633658 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -18,7 +18,7 @@ generated: clean-generated $(GENERATED)
 # test programs
 #
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
+progs_ldadd = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS)
 
 #SLOWTESTS         += cxxbinding
 #cxxbinding_SOURCES = cxxbinding.cc bsecxxapi.cc
@@ -38,7 +38,7 @@ SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
 lib_LTLIBRARIES = testplugin.la
 testplugin_la_SOURCES = testplugin.cc
 testplugin_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-testplugin_la_LIBADD  = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
+testplugin_la_LIBADD  = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
 EXTRA_DIST += testplugin.idl
 testplugin.genidl.hh: testplugin.idl $(SFIDL)
        $(SFIDL) --core-cxx $(SFIDL_INC) -I$(top_builddir) $< > xgen-$(@F)
diff --git a/tests/latency/Makefile.am b/tests/latency/Makefile.am
index b3b7c8d..59316fe 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -20,7 +20,7 @@ BSESCM    = $(top_builddir)/shell/bsescm-$(BIN_VERSION)
 # bselatencytest:
 bselatencytest_la_SOURCES = bselatencytest.cc
 bselatencytest_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-bselatencytest_la_LIBADD  = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
+bselatencytest_la_LIBADD  = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
 EXTRA_HEADERS += bselatencytest.idl
 $(srcdir)/bselatencytest.cc: bselatencytest.idl
 $(srcdir)/bselatencytest.cc: bselatencytest.genidl.hh
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8b9d600..5022920 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,7 @@ DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CON
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd     = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
+progs_ldadd     = $(top_builddir)/bse/libbse- MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS)
 
 #
 # tools to build
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]