Package: openmama / 2.2.2.1-10

0006-LIBADD-fixes-for-libmamaavis.patch Patch series | download
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
From: Daniel Pocock <daniel@pocock.com.au>
Date: Fri, 9 Aug 2013 15:04:09 +0200
Subject: LIBADD fixes for libmamaavis

---
 mama/c_cpp/src/c/bridge/avis/Makefile.am     |    6 +++++-
 mama/c_cpp/src/c/payload/avismsg/Makefile.am |    4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mama/c_cpp/src/c/bridge/avis/Makefile.am b/mama/c_cpp/src/c/bridge/avis/Makefile.am
index 75f6834..86d7247 100644
--- a/mama/c_cpp/src/c/bridge/avis/Makefile.am
+++ b/mama/c_cpp/src/c/bridge/avis/Makefile.am
@@ -40,7 +40,11 @@ CFLAGS += -Wimplicit -Wno-long-long -Wmissing-prototypes -Wstrict-prototypes -Wa
 CPPFLAGS += -Wno-long-long -Wimplicit -Wno-long-long -Wmissing-prototypes -Wstrict-prototypes -Wall
 endif
 
-LIBS    = -lavis -lmama -lm -lwombatcommon -luuid
+libmamaavisimpl_la_LIBADD = -lavis
+libmamaavisimpl_la_LIBADD += ../../libmama.la
+libmamaavisimpl_la_LIBADD += ../../../../../../common/c_cpp/src/c/libwombatcommon.la
+libmamaavisimpl_la_LIBADD += -luuid
+libmamaavisimpl_la_LIBADD += -lpthread
 
 libmamaavisimpl_la_SOURCES = \
 	bridge.c \
diff --git a/mama/c_cpp/src/c/payload/avismsg/Makefile.am b/mama/c_cpp/src/c/payload/avismsg/Makefile.am
index 3302741..ba66600 100755
--- a/mama/c_cpp/src/c/payload/avismsg/Makefile.am
+++ b/mama/c_cpp/src/c/payload/avismsg/Makefile.am
@@ -41,7 +41,9 @@ endif
 LDFLAGS  += -L${srcdir}/../../ \
             -L${srcdir}/../../../../../../common/c_cpp/src/c
 
-LIBS    = -lavis -lmama -lm
+libmamaavismsgimpl_la_LIBADD = -lavis
+libmamaavismsgimpl_la_LIBADD += ../../libmama.la
+
 
 # Sources:
 libmamaavismsgimpl_la_SOURCES = \