Package: openmama / 2.2.2.1-10

0004-LIBADD-fixes-for-wombatcommon.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
From: Daniel Pocock <daniel@pocock.com.au>
Date: Fri, 9 Aug 2013 14:47:33 +0200
Subject: LIBADD fixes for wombatcommon

---
 common/c_cpp/src/c/Makefile.am   |    7 ++++++-
 common/c_cpp/src/cpp/Makefile.am |    2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/c_cpp/src/c/Makefile.am b/common/c_cpp/src/c/Makefile.am
index ea3a6e9..66084d5 100644
--- a/common/c_cpp/src/c/Makefile.am
+++ b/common/c_cpp/src/c/Makefile.am
@@ -53,7 +53,12 @@ CFLAGS   += -std=gnu99 -fPIC -pedantic-errors -Wmissing-prototypes -Wstrict-prot
 CPPFLAGS += -fPIC -pedantic-errors -Wno-long-long -D_GNU_SOURCE
 endif
 
-LIBS     += -ldl -luuid
+LIBS     += -ldl
+# this doesn't appear to be used right now:
+#LIBS     += -luuid
+# may not be needed for all platforms, should use configure to check:
+LIBS     += -lpthread
+LIBS     += -lm
 
 libwombatcommon_la_SOURCES = \
     MRSWLock.c \
diff --git a/common/c_cpp/src/cpp/Makefile.am b/common/c_cpp/src/cpp/Makefile.am
index c3c5343..e285ce8 100644
--- a/common/c_cpp/src/cpp/Makefile.am
+++ b/common/c_cpp/src/cpp/Makefile.am
@@ -12,8 +12,6 @@ lib_LTLIBRARIES = libwombatcommoncpp.la
 nobase_include_HEADERS  = \
 	wombat/Lock.h
 
-LIBS     += -ldl -lrt -lwombatcommon
-
 if USE_GCC_FLAGS
 CFLAGS   += -fPIC -pedantic-errors -Wmissing-prototypes -Wstrict-prototypes
 CPPFLAGS += -fPIC -pedantic-errors -Wall -Wno-long-long -D_GNU_SOURCE