From 2c530868f6b0de50a1e20eeb70c626a40d4cd43e Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 17 Jul 2017 13:51:20 +0200 Subject: [PATCH] split out caprovider as libpvAccessCA fixup multi-library build --- examples/Makefile | 2 +- pvtoolsSrc/Makefile | 10 ++++------ src/Makefile | 3 +-- src/ca/Makefile | 9 ++++++--- src/client/Makefile | 12 ++++++------ src/factory/Makefile | 2 +- src/ioc/Makefile | 7 +++---- src/mb/Makefile | 2 +- src/pipelineService/Makefile | 4 ++-- src/pva/Makefile | 4 ++-- src/remote/Makefile | 22 +++++++++++----------- src/remoteClient/Makefile | 2 +- src/rpcClient/Makefile | 2 +- src/rpcService/Makefile | 4 ++-- src/server/Makefile | 12 ++++++------ src/utils/Makefile | 16 ++++++++-------- 16 files changed, 56 insertions(+), 57 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 878e8cc..f031a4f 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,7 +2,7 @@ TOP=.. include $(TOP)/configure/CONFIG -PROD_LIBS += pvAccess pvData ca Com +PROD_LIBS += pvAccessCA pvAccess pvData ca Com TESTPROD_HOST += getme TESTPROD_HOST += putme diff --git a/pvtoolsSrc/Makefile b/pvtoolsSrc/Makefile index c841412..6075d09 100644 --- a/pvtoolsSrc/Makefile +++ b/pvtoolsSrc/Makefile @@ -6,24 +6,22 @@ USR_CPPFLAGS += -I$(TOP)/src/remote PROD_HOST += pvget pvget_SRCS += pvget.cpp -pvget_LIBS += pvAccess pvData $(MBLIB) ca Com PROD_HOST += pvput pvput_SRCS += pvput.cpp -pvput_LIBS += pvAccess pvData $(MBLIB) ca Com PROD_HOST += pvinfo pvinfo_SRCS += pvinfo.cpp -pvinfo_LIBS += pvAccess pvData $(MBLIB) ca Com PROD_HOST += pvlist pvlist_SRCS += pvlist.cpp -pvlist_LIBS += pvAccess pvData $(MBLIB) Com -pvlist_SYS_LIBS_WIN32 += ws2_32 PROD_HOST += eget eget_SRCS += eget.cpp -eget_LIBS += pvAccess pvData $(MBLIB) ca Com + +PROD_LIBS += pvAccessCA pvAccess pvData $(MBLIB) ca Com + +PROD_SYS_LIBS_WIN32 += ws2_32 include $(TOP)/configure/RULES #---------------------------------------- diff --git a/src/Makefile b/src/Makefile index 5b93948..bc9ae81 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,13 +25,12 @@ include $(PVACCESS_SRC)/pipelineService/Makefile include $(PVACCESS_SRC)/ca/Makefile include $(PVACCESS_SRC)/mb/Makefile -LIBRARY = pvAccess +LIBRARY += pvAccess pvAccess_LIBS += pvData ifdef WITH_MICROBENCH LIB_LIBS += pvMB endif -LIB_LIBS += ca LIB_LIBS += Com # needed for Windows diff --git a/src/ca/Makefile b/src/ca/Makefile index 7ec35a0..9cd508a 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -2,10 +2,13 @@ SRC_DIRS += $(PVACCESS_SRC)/ca +LIBRARY += pvAccessCA +pvAccessCA_LIBS += ca pvAccess pvData Com + INC += pv/caProvider.h INC += pv/caChannel.h INC += pv/caStatus.h -LIBSRCS += caProvider.cpp -LIBSRCS += caChannel.cpp -LIBSRCS += caStatus.cpp +pvAccessCA_SRCS += caProvider.cpp +pvAccessCA_SRCS += caChannel.cpp +pvAccessCA_SRCS += caStatus.cpp diff --git a/src/client/Makefile b/src/client/Makefile index 84e09af..a8636cb 100644 --- a/src/client/Makefile +++ b/src/client/Makefile @@ -6,9 +6,9 @@ INC += pv/monitor.h INC += pv/pvAccess.h INC += pva/client.h -LIBSRCS += pvAccess.cpp -LIBSRCS += client.cpp -LIBSRCS += clientSync.cpp -LIBSRCS += clientGet.cpp -LIBSRCS += clientRPC.cpp -LIBSRCS += clientMonitor.cpp +pvAccess_SRCS += pvAccess.cpp +pvAccess_SRCS += client.cpp +pvAccess_SRCS += clientSync.cpp +pvAccess_SRCS += clientGet.cpp +pvAccess_SRCS += clientRPC.cpp +pvAccess_SRCS += clientMonitor.cpp diff --git a/src/factory/Makefile b/src/factory/Makefile index 28f2489..f9853ef 100644 --- a/src/factory/Makefile +++ b/src/factory/Makefile @@ -2,4 +2,4 @@ SRC_DIRS += $(PVACCESS_SRC)/factory -LIBSRCS += ChannelAccessFactory.cpp +pvAccess_SRCS += ChannelAccessFactory.cpp diff --git a/src/ioc/Makefile b/src/ioc/Makefile index f07c222..5e165b5 100644 --- a/src/ioc/Makefile +++ b/src/ioc/Makefile @@ -4,15 +4,14 @@ include $(TOP)/configure/CONFIG LIBRARY += pvAccessIOC pvAccessIOC_LIBS += pvAccess pvData +pvAccessIOC_LIBS += $(EPICS_BASE_IOC_LIBS) INC += pv/syncChannelFind.h DBD += PVAServerRegister.dbd DBD += PVAClientRegister.dbd -LIBSRCS += PVAServerRegister.cpp -LIBSRCS += PVAClientRegister.cpp - -pvAccessIOC_LIBS += $(EPICS_BASE_IOC_LIBS) +pvAccessIOC_SRCS += PVAServerRegister.cpp +pvAccessIOC_SRCS += PVAClientRegister.cpp include $(TOP)/configure/RULES diff --git a/src/mb/Makefile b/src/mb/Makefile index a239f04..621269b 100644 --- a/src/mb/Makefile +++ b/src/mb/Makefile @@ -4,4 +4,4 @@ SRC_DIRS += $(PVACCESS_SRC)/mb INC += pv/pvAccessMB.h -LIBSRCS += pvAccessMB.cpp +pvAccess_SRCS += pvAccessMB.cpp diff --git a/src/pipelineService/Makefile b/src/pipelineService/Makefile index 166dc63..d3d6143 100644 --- a/src/pipelineService/Makefile +++ b/src/pipelineService/Makefile @@ -5,5 +5,5 @@ SRC_DIRS += $(PVACCESS_SRC)/pipelineService INC += pv/pipelineService.h INC += pv/pipelineServer.h -LIBSRCS += pipelineService.cpp -LIBSRCS += pipelineServer.cpp +pvAccess_SRCS += pipelineService.cpp +pvAccess_SRCS += pipelineServer.cpp diff --git a/src/pva/Makefile b/src/pva/Makefile index 1bf2665..0a030ff 100644 --- a/src/pva/Makefile +++ b/src/pva/Makefile @@ -8,5 +8,5 @@ INC += pv/pvaVersion.h INC += pv/pvaVersionNum.h INC += pv/clientFactory.h -LIBSRCS += pvaVersion.cpp -LIBSRCS += clientFactory.cpp +pvAccess_SRCS += pvaVersion.cpp +pvAccess_SRCS += clientFactory.cpp diff --git a/src/remote/Makefile b/src/remote/Makefile index 943cf9d..1e180cf 100644 --- a/src/remote/Makefile +++ b/src/remote/Makefile @@ -5,14 +5,14 @@ SRC_DIRS += $(PVACCESS_SRC)/remote INC += pv/security.h INC += pv/serializationHelper.h -LIBSRCS += blockingUDPTransport.cpp -LIBSRCS += blockingUDPConnector.cpp -LIBSRCS += beaconHandler.cpp -LIBSRCS += blockingTCPConnector.cpp -LIBSRCS += simpleChannelSearchManagerImpl.cpp -LIBSRCS += abstractResponseHandler.cpp -LIBSRCS += blockingTCPAcceptor.cpp -LIBSRCS += transportRegistry.cpp -LIBSRCS += serializationHelper.cpp -LIBSRCS += codec.cpp -LIBSRCS += security.cpp +pvAccess_SRCS += blockingUDPTransport.cpp +pvAccess_SRCS += blockingUDPConnector.cpp +pvAccess_SRCS += beaconHandler.cpp +pvAccess_SRCS += blockingTCPConnector.cpp +pvAccess_SRCS += simpleChannelSearchManagerImpl.cpp +pvAccess_SRCS += abstractResponseHandler.cpp +pvAccess_SRCS += blockingTCPAcceptor.cpp +pvAccess_SRCS += transportRegistry.cpp +pvAccess_SRCS += serializationHelper.cpp +pvAccess_SRCS += codec.cpp +pvAccess_SRCS += security.cpp diff --git a/src/remoteClient/Makefile b/src/remoteClient/Makefile index 25ef118..808a324 100644 --- a/src/remoteClient/Makefile +++ b/src/remoteClient/Makefile @@ -2,4 +2,4 @@ SRC_DIRS += $(PVACCESS_SRC)/remoteClient -LIBSRCS += clientContextImpl.cpp +pvAccess_SRCS += clientContextImpl.cpp diff --git a/src/rpcClient/Makefile b/src/rpcClient/Makefile index e7fe68f..d99ba0d 100644 --- a/src/rpcClient/Makefile +++ b/src/rpcClient/Makefile @@ -4,4 +4,4 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcClient INC += pv/rpcClient.h -LIBSRCS += rpcClient.cpp +pvAccess_SRCS += rpcClient.cpp diff --git a/src/rpcService/Makefile b/src/rpcService/Makefile index 4ce3cc6..6db5371 100644 --- a/src/rpcService/Makefile +++ b/src/rpcService/Makefile @@ -5,5 +5,5 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcService INC += pv/rpcService.h INC += pv/rpcServer.h -LIBSRCS += rpcService.cpp -LIBSRCS += rpcServer.cpp +pvAccess_SRCS += rpcService.cpp +pvAccess_SRCS += rpcServer.cpp diff --git a/src/server/Makefile b/src/server/Makefile index d0e2f08..3e94a4f 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -5,9 +5,9 @@ SRC_DIRS += $(PVACCESS_SRC)/server INC += pv/serverContext.h INC += pv/beaconServerStatusProvider.h -LIBSRCS += responseHandlers.cpp -LIBSRCS += serverContext.cpp -LIBSRCS += serverChannelImpl.cpp -LIBSRCS += baseChannelRequester.cpp -LIBSRCS += beaconEmitter.cpp -LIBSRCS += beaconServerStatusProvider.cpp +pvAccess_SRCS += responseHandlers.cpp +pvAccess_SRCS += serverContext.cpp +pvAccess_SRCS += serverChannelImpl.cpp +pvAccess_SRCS += baseChannelRequester.cpp +pvAccess_SRCS += beaconEmitter.cpp +pvAccess_SRCS += beaconServerStatusProvider.cpp diff --git a/src/utils/Makefile b/src/utils/Makefile index dc02348..9d37cca 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -15,11 +15,11 @@ INC += pv/fairQueue.h INC += pv/requester.h INC += pv/destroyable.h -LIBSRCS += hexDump.cpp -LIBSRCS += inetAddressUtil.cpp -LIBSRCS += logger.cpp -LIBSRCS += introspectionRegistry.cpp -LIBSRCS += configuration.cpp -LIBSRCS += referenceCountingLock.cpp -LIBSRCS += requester.cpp -LIBSRCS += wildcard.cpp +pvAccess_SRCS += hexDump.cpp +pvAccess_SRCS += inetAddressUtil.cpp +pvAccess_SRCS += logger.cpp +pvAccess_SRCS += introspectionRegistry.cpp +pvAccess_SRCS += configuration.cpp +pvAccess_SRCS += referenceCountingLock.cpp +pvAccess_SRCS += requester.cpp +pvAccess_SRCS += wildcard.cpp