summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJyri Sarha <jyri.sarha@nokia.com>2010-11-26 18:38:27 +0200
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-03-28 19:04:33 +0530
commit4be49ae94b19367dc2f40f5807a825b8f6244983 (patch)
treeeb8f7107c83d6af5ff75594de885e9318913f53b
parentc25207fc1736eb3964358c4c3e2f9b030c0727f1 (diff)
build-sys: Link lirc libraries in right order
Wrong order of libraries causes libtool to link primarily from lirc library location and not from $(libdir) location in install phase. This is a problem if you have an older version pulseaudio libs installed under same directory as liblirc and you are building a newer version with some other directory prefix.
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1058f181..cc38db23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1505,7 +1505,7 @@ module_zeroconf_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
module_lirc_la_SOURCES = modules/module-lirc.c
module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
+module_lirc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIRC_LIBS)
module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
# Linux evdev