blob: c7aae172557099e6858e91105a94757a0d37ed4e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
liblinphone.la does not seem to properly add -L paths to libmediastreamer.la,
so force the issue to work around the link failure caused by the -rpath added
to /usr/lib/linphone/ and having an already installed older version of linphone
--- console/Makefile.in
+++ console/Makefile.in
@@ -287,12 +287,12 @@
@BUILD_CONSOLE_TRUE@ -I$(osip_prefix)/include
@BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c
-@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) $(OSIP_LIBS)
+@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS)
@BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \
@BUILD_CONSOLE_TRUE@ sipomatic.c sipomatic.h
@BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS) \
-@BUILD_CONSOLE_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
+@BUILD_CONSOLE_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@BUILD_CONSOLE_TRUE@ $(OSIP_LIBS)
AM_CFLAGS = $(STRICT_OPTIONS) -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
--- gtk/Makefile.in
+++ gtk/Makefile.in
@@ -335,7 +335,7 @@
@BUILD_GTK_TRUE@ $(linphone_common_sources)
@BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
-@BUILD_GTK_TRUE@ $(top_builddir)/coreapi/liblinphone.la
+@BUILD_GTK_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la
AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
$(ORTP_CFLAGS) $(OSIP_CFLAGS)
@@ -348,7 +348,7 @@
@BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
@BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
@BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \
-@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la \
+@BUILD_GNOME_APPLET_TRUE@ $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
@BUILD_GNOME_APPLET_TRUE@ $(OSIP_LIBS)
@BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
|
GitWeb
