From 58914fd09367bd577ebaa970fe57697f57be6dcf Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 26 Jan 2016 15:50:49 -0500 Subject: [PATCH] update Makefiles for pv/ add pv/ prefix for INC --- src/Makefile | 3 --- src/ca/Makefile | 6 +++--- src/client/Makefile | 2 +- src/ioc/Makefile | 2 +- src/mb/Makefile | 2 +- src/pipelineService/Makefile | 4 ++-- src/pva/Makefile | 8 ++++---- src/remote/Makefile | 20 ++++++++++---------- src/remoteClient/Makefile | 2 +- src/rpcClient/Makefile | 2 +- src/rpcService/Makefile | 4 ++-- src/server/Makefile | 12 ++++++------ src/utils/Makefile | 18 +++++++++--------- 13 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/Makefile b/src/Makefile index f2c3c63..925acec 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,9 +15,6 @@ EXPANDVARS += EPICS_PVA_DEVELOPMENT_FLAG EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))") -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I$(INSTALL_LOCATION)/include - PVACCESS_SRC = $(TOP)/src include $(PVACCESS_SRC)/pva/Makefile diff --git a/src/ca/Makefile b/src/ca/Makefile index 33aca1e..7ec35a0 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -2,9 +2,9 @@ SRC_DIRS += $(PVACCESS_SRC)/ca -INC += caProvider.h -INC += caChannel.h -INC += caStatus.h +INC += pv/caProvider.h +INC += pv/caChannel.h +INC += pv/caStatus.h LIBSRCS += caProvider.cpp LIBSRCS += caChannel.cpp diff --git a/src/client/Makefile b/src/client/Makefile index 8f569c8..a89c26d 100644 --- a/src/client/Makefile +++ b/src/client/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/client -INC += pvAccess.h +INC += pv/pvAccess.h LIBSRCS += pvAccess.cpp diff --git a/src/ioc/Makefile b/src/ioc/Makefile index 69fa483..3873271 100644 --- a/src/ioc/Makefile +++ b/src/ioc/Makefile @@ -2,7 +2,7 @@ SRC_DIRS += $(PVACCESS_SRC)/ioc -INC += syncChannelFind.h +INC += pv/syncChannelFind.h DBD += PVAServerRegister.dbd DBD += PVAClientRegister.dbd diff --git a/src/mb/Makefile b/src/mb/Makefile index a9fce30..a239f04 100644 --- a/src/mb/Makefile +++ b/src/mb/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/mb -INC += pvAccessMB.h +INC += pv/pvAccessMB.h LIBSRCS += pvAccessMB.cpp diff --git a/src/pipelineService/Makefile b/src/pipelineService/Makefile index 005179c..166dc63 100644 --- a/src/pipelineService/Makefile +++ b/src/pipelineService/Makefile @@ -2,8 +2,8 @@ SRC_DIRS += $(PVACCESS_SRC)/pipelineService -INC += pipelineService.h -INC += pipelineServer.h +INC += pv/pipelineService.h +INC += pv/pipelineServer.h LIBSRCS += pipelineService.cpp LIBSRCS += pipelineServer.cpp diff --git a/src/pva/Makefile b/src/pva/Makefile index e68702d..a1b75dc 100644 --- a/src/pva/Makefile +++ b/src/pva/Makefile @@ -2,10 +2,10 @@ SRC_DIRS += $(PVACCESS_SRC)/pva -INC += pvaConstants.h -INC += pvaVersion.h -INC += pvaVersionNum.h -INC += clientFactory.h +INC += pv/pvaConstants.h +INC += pv/pvaVersion.h +INC += pv/pvaVersionNum.h +INC += pv/clientFactory.h LIBSRCS += pvaVersion.cpp LIBSRCS += clientFactory.cpp diff --git a/src/remote/Makefile b/src/remote/Makefile index 0218986..6b7a417 100644 --- a/src/remote/Makefile +++ b/src/remote/Makefile @@ -2,16 +2,16 @@ SRC_DIRS += $(PVACCESS_SRC)/remote -INC += remote.h -INC += security.h -INC += blockingUDP.h -INC += beaconHandler.h -INC += blockingTCP.h -INC += channelSearchManager.h -INC += simpleChannelSearchManagerImpl.h -INC += transportRegistry.h -INC += serializationHelper.h -INC += codec.h +INC += pv/remote.h +INC += pv/security.h +INC += pv/blockingUDP.h +INC += pv/beaconHandler.h +INC += pv/blockingTCP.h +INC += pv/channelSearchManager.h +INC += pv/simpleChannelSearchManagerImpl.h +INC += pv/transportRegistry.h +INC += pv/serializationHelper.h +INC += pv/codec.h LIBSRCS += blockingUDPTransport.cpp LIBSRCS += blockingUDPConnector.cpp diff --git a/src/remoteClient/Makefile b/src/remoteClient/Makefile index 2d0f390..494f695 100644 --- a/src/remoteClient/Makefile +++ b/src/remoteClient/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/remoteClient -INC += clientContextImpl.h +INC += pv/clientContextImpl.h LIBSRCS += clientContextImpl.cpp diff --git a/src/rpcClient/Makefile b/src/rpcClient/Makefile index e41747e..e7fe68f 100644 --- a/src/rpcClient/Makefile +++ b/src/rpcClient/Makefile @@ -2,6 +2,6 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcClient -INC += rpcClient.h +INC += pv/rpcClient.h LIBSRCS += rpcClient.cpp diff --git a/src/rpcService/Makefile b/src/rpcService/Makefile index 8a236f7..4ce3cc6 100644 --- a/src/rpcService/Makefile +++ b/src/rpcService/Makefile @@ -2,8 +2,8 @@ SRC_DIRS += $(PVACCESS_SRC)/rpcService -INC += rpcService.h -INC += rpcServer.h +INC += pv/rpcService.h +INC += pv/rpcServer.h LIBSRCS += rpcService.cpp LIBSRCS += rpcServer.cpp diff --git a/src/server/Makefile b/src/server/Makefile index f8fcdcb..3334bae 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -2,12 +2,12 @@ SRC_DIRS += $(PVACCESS_SRC)/server -INC += serverContext.h -INC += responseHandlers.h -INC += serverChannelImpl.h -INC += baseChannelRequester.h -INC += beaconEmitter.h -INC += beaconServerStatusProvider.h +INC += pv/serverContext.h +INC += pv/responseHandlers.h +INC += pv/serverChannelImpl.h +INC += pv/baseChannelRequester.h +INC += pv/beaconEmitter.h +INC += pv/beaconServerStatusProvider.h LIBSRCS += responseHandlers.cpp LIBSRCS += serverContext.cpp diff --git a/src/utils/Makefile b/src/utils/Makefile index f7e163c..d34964a 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -2,15 +2,15 @@ SRC_DIRS += $(PVACCESS_SRC)/utils -INC += hexDump.h -INC += inetAddressUtil.h -INC += logger.h -INC += introspectionRegistry.h -INC += namedLockPattern.h -INC += referenceCountingLock.h -INC += configuration.h -INC += likely.h -INC += wildcard.h +INC += pv/hexDump.h +INC += pv/inetAddressUtil.h +INC += pv/logger.h +INC += pv/introspectionRegistry.h +INC += pv/namedLockPattern.h +INC += pv/referenceCountingLock.h +INC += pv/configuration.h +INC += pv/likely.h +INC += pv/wildcard.h LIBSRCS += hexDump.cpp LIBSRCS += inetAddressUtil.cpp