diff options
| author | Felipe Sateler <fsateler@debian.org> | 2015-12-28 20:34:08 -0300 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2015-12-29 05:36:50 +0530 |
| commit | 5e8161448edad13d6613191133e0f4b498882917 (patch) | |
| tree | 0d582966a829ce70d09fab7857dfed1430cd5076 | |
| parent | cd74d8f013f480f7245e7b7a1347701a0ce2034a (diff) | |
| download | pulseaudio-5e8161448edad13d6613191133e0f4b498882917.tar.gz | |
build-sys: Fix install order of libpulsecore
It needs to be installed after libpulse, because of libtool relinking.
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3c035aa9a..b0ca2bcd4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -631,7 +631,8 @@ lo_latency_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS) # Common library # ################################### -pkglib_LTLIBRARIES = \ +commonlibdir = $(pkglibdir) +commonlib_LTLIBRARIES = \ libpulsecommon-@PA_MAJORMINOR@.la # We duplicate files from pulse/ in this to allow as-needed linking. If we did @@ -918,7 +919,7 @@ libpulsedsp_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version -disable- # Daemon core library # ################################### -pkglib_LTLIBRARIES += libpulsecore-@PA_MAJORMINOR@.la +pkglib_LTLIBRARIES = libpulsecore-@PA_MAJORMINOR@.la # Pure core stuff libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \ @@ -2262,7 +2263,10 @@ update-all: update-ffmpeg update-map-file # Isn't libtool/autotools fun! installlibLTLIBRARIES = install-libLTLIBRARIES -$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES +$(installlibLTLIBRARIES): install-commonlibLTLIBRARIES + +installpkglibLTLIBRARIES = install-pkglibLTLIBRARIES +$(installpkglibLTLIBRARIES): install-libLTLIBRARIES installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES $(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES install-libLTLIBRARIES |