Update of local copy of Windows pthreads library to MinGW-w64 winpthreads.

[orte.git] / orte / liborte / Makefile.omk

diff --git a/orte/liborte/Makefile.omk b/orte/liborte/Makefile.omk
index abc7c207727f69c8e676dbc8e93417194484502f..5d26deab37362f5ec3237e3bca20e60a1914535c 100644 (file)
--- a/orte/liborte/Makefile.omk
+++ b/orte/liborte/Makefile.omk
@@ -1,13 +1,10 @@
 default_CONFIG = CONFIG_OC_ETH_ORTE=y
 default_CONFIG += CONFIG_OC_ETH_ORTE_SOLIB=n
 
-ifeq ($(CONFIG_OC_ETH_ORTE),y)
-
-lib_LIBRARIES = orte
-
-ifeq ($(CONFIG_OC_ETH_ORTE_SOLIB),y)
-shared_LIBRARIES = orte
-endif #CONFIG_OC_ETH_ORTE_LIB
+ifeq ($(TARGET_OS),win32)
+renamed_include_HEADERS = \
+../contrib/win_pthread/libpthread.a->../lib/libpthread.a
+endif #TARGET_OS
 
 INCLUDES = -I $(srcdir)/../include
 
@@ -57,17 +54,25 @@ ul_gavl.c \
 ul_gavlprim.c \
 cdr.c
 
+ifeq ($(CONFIG_OC_ETH_ORTE),y)
+lib_LIBRARIES = orte
 endif #CONFIG_OC_ETH_ORTE
 
+ifeq ($(CONFIG_OC_ETH_ORTE_SOLIB),y)
+shared_LIBRARIES = orte
+TARGET_LOADLIBES ?= pthread
+
+lib_LOADLIBES = $(TARGET_LOADLIBES)
+ifeq ($(TARGET_OS),win32)
+lib_LOADLIBES += ws2_32
+endif #TARGET_OS
+endif #CONFIG_OC_ETH_ORTE_SOLIB
+
 #############################################################################
 # RT-Linux version of build
 
 default_CONFIG += CONFIG_OC_ETH_ORTE_RTL=n
 
-ifeq ($(CONFIG_OC_ETH_ORTE_RTL),y)
-
-rtlinux_LIBRARIES = orte_rt
-
 rtlinux_INCLUDES = -I $(srcdir)/../include
 
 ortert_SOURCES = \
@@ -116,10 +121,9 @@ ul_gavl.c \
 ul_gavlprim.c \
 cdr.c
 
+ifeq ($(CONFIG_OC_ETH_ORTE_RTL),y)
+rtlinux_LIBRARIES = orte_rt
 rtlinux_MODULES = orte_rt
-
 orte_rt_SOURCES = $(ortert_SOURCES)
-
 SUBDIRS = rtl
-
 endif #CONFIG_OC_ETH_ORTE_RTL