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 53ed8a207c72ea1a5dd7e5604577be1015a5b606..5d26deab37362f5ec3237e3bca20e60a1914535c 100644 (file)
--- a/orte/liborte/Makefile.omk
+++ b/orte/liborte/Makefile.omk
@@ -1,13 +1,12 @@
-lib_LIBRARIES = orte
+default_CONFIG = CONFIG_OC_ETH_ORTE=y
+default_CONFIG += CONFIG_OC_ETH_ORTE_SOLIB=n
 
-INCLUDES = -I $(srcdir)/../include -D_OMK_UNIX
+ifeq ($(TARGET_OS),win32)
+renamed_include_HEADERS = \
+../contrib/win_pthread/libpthread.a->../lib/libpthread.a
+endif #TARGET_OS
 
-include_HEADERS = \
-../include/orte_api.h \
-../include/typedefs_defines_rtps.h \
-../include/defines_api.h \
-../include/typedefs_api.h \
-../include/protos_api.h
+INCLUDES = -I $(srcdir)/../include
 
 orte_SOURCES = \
 conv.c \
@@ -18,8 +17,7 @@ htimerNtp.c \
 objectEntry.c \
 objectEntryTimer.c \
 objectUtils.c \
-ORTEAppRecvMetatrafficThread.c \
-ORTEAppRecvUserdataThread.c \
+ORTEAppRecvThread.c \
 ORTEAppSendThread.c \
 ORTEDomainApp.c \
 ORTEPublication.c \
@@ -32,6 +30,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
@@ -52,23 +51,31 @@ RTPSVar.c \
 RTPSIssue.c \
 sock.c \
 ul_gavl.c \
-ul_gavlprim.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
 
-rtlinux_LIBRARIES = orte_rt
-
-rtlinux_INCLUDES = -I $(srcdir)/../include 
+default_CONFIG += CONFIG_OC_ETH_ORTE_RTL=n
 
-rtlinux_HEADERS = \
-../include/orte_api.h \
-../include/typedefs_defines_rtps.h \
-../include/defines_api.h \
-../include/typedefs_api.h \
-../include/protos_api.h
+rtlinux_INCLUDES = -I $(srcdir)/../include
 
-orte_rt_SOURCES = \
+ortert_SOURCES = \
 conv.c \
 debug.c \
 event.c \
@@ -77,8 +84,7 @@ htimerNtp.c \
 objectEntry.c \
 objectEntryTimer.c \
 objectUtils.c \
-ORTEAppRecvMetatrafficThread.c \
-ORTEAppRecvUserdataThread.c \
+ORTEAppRecvThread.c \
 ORTEAppSendThread.c \
 ORTEDomainApp.c \
 ORTEPublication.c \
@@ -91,6 +97,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
@@ -111,10 +118,12 @@ RTPSVar.c \
 RTPSIssue.c \
 sock.c \
 ul_gavl.c \
-ul_gavlprim.c
-
-rtlinux_MODULES = rt_orte
-
-rt_orte_SOURCES = $(orte_rt_SOURCES)
+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