OMK build: move linker specification of pthread library to separate variable TARGET_L...

This allows to override libraries list suitable for the Linux
build by other target OS specific list of the libraries.
I.e. the explicit "pthread" library specification is blocker
for QNX/BlackBerry build because POSIX threads are included
in stadartd library. On the other hand BSD networking "socket"
library has to be specified explicitly. Another difference
is missing "byteswap.h" header file (undef HAVE_BYTESWAP_H).

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/orte/examples/hello/Makefile.omk b/orte/examples/hello/Makefile.omk
index eaf9ae7ffae8255b244f7711d10e34660e921282..8e37c147d502090911e9f944802c16955a398fb3 100644 (file)
--- a/orte/examples/hello/Makefile.omk
+++ b/orte/examples/hello/Makefile.omk
@@ -11,7 +11,9 @@ h_publisher_SOURCES = h_publisher.c
 
 h_subscriber_SOURCES = h_subscriber.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/examples/multicast/Makefile.omk b/orte/examples/multicast/Makefile.omk
index a7d19ff25020b4b7a853346974ffb4fb0f4805c9..06bcdc80826f481c9a2c6772d9832be204983cf3 100644 (file)
--- a/orte/examples/multicast/Makefile.omk
+++ b/orte/examples/multicast/Makefile.omk
@@ -9,7 +9,9 @@ endif
 
 m_subscriber_SOURCES = m_subscriber.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/examples/ping/Makefile.omk b/orte/examples/ping/Makefile.omk
index 4e6e4217f26108dd0752d7c5bd4d8982fce8fc64..edd67529dc689152c0a857ed2d221f959cd4a863 100644 (file)
--- a/orte/examples/ping/Makefile.omk
+++ b/orte/examples/ping/Makefile.omk
@@ -9,7 +9,9 @@ endif
 
 orteping_SOURCES = orteping.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/examples/reliable/Makefile.omk b/orte/examples/reliable/Makefile.omk
index 97fc242158413d6d56d3650f159c13c1d3371e2c..53c4733ac92648c9d31fd0259fc29f7046dbb762 100644 (file)
--- a/orte/examples/reliable/Makefile.omk
+++ b/orte/examples/reliable/Makefile.omk
@@ -13,7 +13,9 @@ r_subscriber_reliable_SOURCES = r_subscriber_reliable.c
 
 r_subscriber_besteffort_SOURCES = r_subscriber_besteffort.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/examples/schneider/Makefile.omk b/orte/examples/schneider/Makefile.omk
index eb0ece129bfffb2e4875e2db97fd42599ebd86c2..0789c86ee0e4ad5c20313617debaecf53f653c03 100644 (file)
--- a/orte/examples/schneider/Makefile.omk
+++ b/orte/examples/schneider/Makefile.omk
@@ -9,7 +9,9 @@ endif
 
 schneider_subscriber_SOURCES = schneider_subscriber.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/examples/spy/Makefile.omk b/orte/examples/spy/Makefile.omk
index 2015c60d13b3c02be4502f3d0d0f362a18a23fd5..b3853f91aaa8ae3a2fcba9b3a01cb4956be1091d 100644 (file)
--- a/orte/examples/spy/Makefile.omk
+++ b/orte/examples/spy/Makefile.omk
@@ -9,7 +9,9 @@ endif
 
 ortespy_SOURCES = ortespy.c
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES +=  ws2_32
 endif #TARGET_OS

diff --git a/orte/liborte/Makefile.omk b/orte/liborte/Makefile.omk
index 35f80be4d9d4f32265e78605ccc26de80c9243d9..af0bc23268478e3ea4fa5fbf613235d7b276d8bc 100644 (file)
--- a/orte/liborte/Makefile.omk
+++ b/orte/liborte/Makefile.omk
@@ -60,7 +60,9 @@ endif #CONFIG_OC_ETH_ORTE
 
 ifeq ($(CONFIG_OC_ETH_ORTE_SOLIB),y)
 shared_LIBRARIES = orte
-lib_LOADLIBES = pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES = $(TARGET_LOADLIBES)
 ifeq ($(TARGET_OS),win32)
 lib_LOADLIBES += ws2_32
 endif #TARGET_OS

diff --git a/orte/manager/Makefile.omk b/orte/manager/Makefile.omk
index 6b9e932b55d4e22380e79339999f35a21ed181c3..f873f58cc05eb6af19faded98d557c2570602027 100644 (file)
--- a/orte/manager/Makefile.omk
+++ b/orte/manager/Makefile.omk
@@ -12,7 +12,9 @@ else
 bin_PROGRAMS = ortemanager
 endif
 
-lib_LOADLIBES =  orte pthread
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES =  orte $(TARGET_LOADLIBES)
 
 ortemanager_SOURCES = ortemanager.c
 ifeq ($(TARGET_OS),win32)