copy lib now part of pvDatabase

Makefile

@@ -3,12 +3,8 @@ TOP = .
 include $(TOP)/configure/CONFIG
 DIRS += configure
 
-DIRS += src/copy
-src/copy_DEPEND_DIRS = configure
-
-
 DIRS += src
-src_DEPEND_DIRS = configure src/copy
+src_DEPEND_DIRS = configure
 
 DIRS += test
 test_DEPEND_DIRS = src

src/Makefile

@@ -13,21 +13,31 @@ LIBRARY += pvDatabase
 # shared library ABI version.
 SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION)
 
-INC += pv/channelProviderLocal.h
+INC += pv/pvPlugin.h
+INC += pv/pvStructureCopy.h
+INC += pv/pvArrayPlugin.h
+INC += pv/pvDeadbandPlugin.h
+INC += pv/pvTimestampPlugin.h
+
 INC += pv/pvDatabase.h
+
+INC += pv/channelProviderLocal.h
+
 INC += pv/traceRecord.h
 INC += pv/removeRecord.h
 INC += pv/processRecord.h
+
 INC += pv/pvSupport.h
 INC += pv/controlSupport.h
 INC += pv/scalarAlarmSupport.h
 
+
+include $(PVDATABASE_SRC)/copy/Makefile
 include $(PVDATABASE_SRC)/database/Makefile
 include $(PVDATABASE_SRC)/pvAccess/Makefile
 include $(PVDATABASE_SRC)/special/Makefile
 include $(PVDATABASE_SRC)/support/Makefile
 
-pvDatabase_LIBS += pvCopy
 pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
 pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 

src/copy/Makefile

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

src/database/pvDatabase.cpp

@@ -15,9 +15,9 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/pvPlugin.h"
 #include "pv/pvArrayPlugin.h"

src/database/pvRecord.cpp

@@ -23,9 +23,9 @@
 #include <pv/pvData.h>
 #include <pv/rpcService.h>
 #include <pv/pvTimeStamp.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 
 using std::tr1::static_pointer_cast;

src/pvAccess/channelLocal.cpp

@@ -23,9 +23,9 @@
 #include <pv/pvaVersionNum.h>
 #include <pv/serverContext.h>
 #include <pv/pvSubArrayCopy.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/channelProviderLocal.h"
 

src/pvAccess/channelProviderLocal.cpp

@@ -16,9 +16,9 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
 #include <pv/timeStamp.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/channelProviderLocal.h"
 

src/pvAccess/monitorFactory.cpp

@@ -20,9 +20,9 @@
 #include <pv/rpcService.h>
 #include <pv/serverContext.h>
 #include <pv/timeStamp.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/channelProviderLocal.h"
 

src/special/processRecord.cpp

@@ -27,9 +27,9 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 

src/special/processRecordRegister.cpp

@@ -20,9 +20,9 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 

src/special/removeRecord.cpp

@@ -24,9 +24,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include <pv/pvStructureCopy.h>
+
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 

src/special/removeRecordRegister.cpp

@@ -19,9 +19,9 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 

src/special/traceRecord.cpp

@@ -24,9 +24,9 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/channelProviderLocal.h"
 #include "pv/traceRecord.h"
 

src/special/traceRecordRegister.cpp

@@ -20,9 +20,9 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include "pv/pvDatabase.h"
 #include "pv/traceRecord.h"
 

src/support/controlSupport.cpp

@@ -9,12 +9,13 @@
  * @date 2019.06.01
  */
 
-
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
 #include <pv/convert.h>
 #include <pv/standardField.h>
-#include <pv/pvStructureCopy.h>
-
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
 #include <pv/pvSupport.h>
 #include "pv/pvDatabase.h"
 #include "pv/controlSupport.h"

src/support/scalarAlarmSupport.cpp

@@ -8,16 +8,16 @@
  * @author mrk
  * @date 2019.06.01
  */
-
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
 #include <pv/convert.h>
 #include <pv/standardField.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvStructureCopy.h>
-
 
 #define epicsExportSharedSymbols
-#include <pv/pvSupport.h>
+#include "pv/pvStructureCopy.h"
+#include "pv/pvSupport.h"
 #include "pv/pvDatabase.h"
 #include "pv/scalarAlarmSupport.h"
 

test/Makefile

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