epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

WIN32 make pvCopy be a seperate lib instead of part of pvDatabase

Browse Source
This commit is contained in:
mrkraimer
2019-06-22 16:14:40 -04:00
parent 22806c5301
commit 3418c22cde
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,6 +3,10 @@ TOP = .
include $(TOP)/configure/CONFIG include $(TOP)/configure/CONFIG
DIRS += configure DIRS += configure
DIRS += src/copy
src/copy_DEPEND_DIRS = configure
DIRS += src DIRS += src
src_DEPEND_DIRS = configure src_DEPEND_DIRS = configure

3
src/Makefile
View File

@ -21,12 +21,13 @@ INC += pv/processRecord.h
INC += pv/pvSupport.h INC += pv/pvSupport.h
INC += pv/controlSupport.h INC += pv/controlSupport.h
INC += pv/scalarAlarmSupport.h INC += pv/scalarAlarmSupport.h
include $(PVDATABASE_SRC)/copy/Makefile
include $(PVDATABASE_SRC)/database/Makefile include $(PVDATABASE_SRC)/database/Makefile
include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/pvAccess/Makefile
include $(PVDATABASE_SRC)/special/Makefile include $(PVDATABASE_SRC)/special/Makefile
include $(PVDATABASE_SRC)/support/Makefile include $(PVDATABASE_SRC)/support/Makefile
pvDatabase_LIBS += pvCopy
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)

16
src/copy/Makefile
View File

@ -1,6 +1,12 @@
# This is a Makefile fragment, see ../Makefile TOP = ../..
include $(TOP)/configure/CONFIG
SRC_DIRS += $(PVDATABASE_SRC)/copy LIBRARY += pvCopy
SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION)
# needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
INC += pv/pvStructureCopy.h INC += pv/pvStructureCopy.h
INC += pv/pvPlugin.h INC += pv/pvPlugin.h
@ -13,3 +19,9 @@ LIBSRCS += pvArrayPlugin.cpp
LIBSRCS += pvDeadbandPlugin.cpp LIBSRCS += pvDeadbandPlugin.cpp
LIBSRCS += pvTimestampPlugin.cpp LIBSRCS += pvTimestampPlugin.cpp
LIBSRCS += pvCopy.cpp LIBSRCS += pvCopy.cpp
pvCopy_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvCopy_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES

1
test/Makefile
View File

@ -6,6 +6,7 @@ include $(TOP)/configure/CONFIG
PVDATABASE_TEST = $(TOP)/test PVDATABASE_TEST = $(TOP)/test
PROD_LIBS += pvDatabase PROD_LIBS += pvDatabase
PROD_LIBS += pvCopy
PROD_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) PROD_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
PROD_LIBS += $(EPICS_BASE_IOC_LIBS) PROD_LIBS += $(EPICS_BASE_IOC_LIBS)