fixup shared library deps

aderbenev · Jul 24, 2017 · f66d23f · f66d23f
1 parent d67f576
commit f66d23f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/evgMrmApp/src/Makefile b/evgMrmApp/src/Makefile
@@ -57,9 +57,7 @@ evgmrm_SRCS += evgSeqRamManager.cpp
 evgmrm_SRCS += seqconst.c
 evgmrm_SRCS += seqnsls2.c
 
-ifeq ($(OS),Windows_NT)
 evgmrm_LIBS += mrfCommon mrmShared epicsvme epicspci $(EPICS_BASE_IOC_LIBS)
-endif
 
 DBD += evgInit.dbd
 

diff --git a/evrApp/src/Makefile b/evrApp/src/Makefile
@@ -39,9 +39,7 @@ evr_SRCS += devWfMailbox.c
 evr_SRCS_Linux += ntpShm.cpp
 evr_SRCS_DEFAULT += ntpShmNull.cpp
 
-ifeq ($(OS),Windows_NT)
 evr_LIBS += mrfCommon $(EPICS_BASE_IOC_LIBS)
-endif
 
 # Note: evrtest is NOT a working ioc.
 #       it exists to ensure that libevr

diff --git a/evrMrmApp/src/Makefile b/evrMrmApp/src/Makefile
@@ -34,9 +34,7 @@ evrMrm_SRCS += irqHack.cpp
 
 evrMrm_SRCS += mrmGpio.cpp
 
-ifeq ($(OS),Windows_NT)
 evrMrm_LIBS += mrfCommon mrmShared evr epicspci epicsvme $(EPICS_BASE_IOC_LIBS)
-endif
 
 #=============================
 # Install the modular register map event receiver support dbd

diff --git a/mrfApp/src/Makefile b/mrfApp/src/Makefile
@@ -58,6 +58,8 @@ endif
 # Finally link to the EPICS Base libraries
 mrf_LIBS += $(EPICS_BASE_IOC_LIBS)
 
+mrf_SYS_LIBS_WIN32 = ws2_32
+
 #===========================
 
 include $(TOP)/configure/RULES

diff --git a/mrmShared/src/Makefile b/mrmShared/src/Makefile
@@ -16,10 +16,7 @@ mrmShared_SRCS += mrmDataBufTx.cpp
 mrmShared_SRCS += devMrfBufTx.cpp
 mrmShared_SRCS += sfp.cpp
 
-ifeq ($(OS),Windows_NT)
 mrmShared_LIBS += mrfCommon $(EPICS_BASE_IOC_LIBS)
-mrmShared_SYS_LIBS += WS2_32
-endif
 
 #---------------------
 # Generic EPICS build rules