Matej Sekoranja
+2
-4
@@ -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
|
||||
@@ -49,5 +46,6 @@ include $(TOP)/configure/RULES
|
||||
|
||||
# Can't use EXPAND as generated headers must appear
|
||||
# in O.Common, but EXPAND emits rules for O.$(T_A)
|
||||
../O.Common/pvaVersionNum.h: ../pva/pvaVersionNum.h@
|
||||
../O.Common/pv/pvaVersionNum.h: ../pva/pvaVersionNum.h@
|
||||
$(MKDIR) $(COMMON_DIR)/pv
|
||||
$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/* for CA */
|
||||
#include <cadef.h>
|
||||
|
||||
#include <caProvider.h>
|
||||
#include <pv/caProvider.h>
|
||||
|
||||
namespace epics {
|
||||
namespace pvAccess {
|
||||
+1
-1
@@ -2,6 +2,6 @@
|
||||
|
||||
SRC_DIRS += $(PVACCESS_SRC)/client
|
||||
|
||||
INC += pvAccess.h
|
||||
INC += pv/pvAccess.h
|
||||
|
||||
LIBSRCS += pvAccess.cpp
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
SRC_DIRS += $(PVACCESS_SRC)/ioc
|
||||
|
||||
INC += syncChannelFind.h
|
||||
INC += pv/syncChannelFind.h
|
||||
|
||||
DBD += PVAServerRegister.dbd
|
||||
DBD += PVAClientRegister.dbd
|
||||
|
||||
+1
-1
@@ -2,6 +2,6 @@
|
||||
|
||||
SRC_DIRS += $(PVACCESS_SRC)/mb
|
||||
|
||||
INC += pvAccessMB.h
|
||||
INC += pv/pvAccessMB.h
|
||||
|
||||
LIBSRCS += pvAccessMB.cpp
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#include "pvAccessMB.h"
|
||||
#include "pv/pvAccessMB.h"
|
||||
|
||||
MB_DECLARE(channelGet, 100000);
|
||||
|
||||
@@ -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
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
#include "pvaVersionNum.h"
|
||||
#include "pv/pvaVersionNum.h"
|
||||
|
||||
namespace epics {
|
||||
namespace pvAccess {
|
||||
+10
-10
@@ -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
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
#include <pv/blockingTCP.h>
|
||||
#include "codec.h"
|
||||
#include <pv/codec.h>
|
||||
#include <pv/remote.h>
|
||||
#include <pv/logger.h>
|
||||
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
|
||||
SRC_DIRS += $(PVACCESS_SRC)/remoteClient
|
||||
|
||||
INC += clientContextImpl.h
|
||||
INC += pv/clientContextImpl.h
|
||||
|
||||
LIBSRCS += clientContextImpl.cpp
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
|
||||
SRC_DIRS += $(PVACCESS_SRC)/rpcClient
|
||||
|
||||
INC += rpcClient.h
|
||||
INC += pv/rpcClient.h
|
||||
|
||||
LIBSRCS += rpcClient.cpp
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <pv/logger.h>
|
||||
#include <pv/rpcService.h>
|
||||
|
||||
#include "rpcClient.h"
|
||||
#include "pv/rpcClient.h"
|
||||
|
||||
|
||||
using namespace epics::pvData;
|
||||
|
||||
@@ -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
|
||||
|
||||
+6
-6
@@ -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
|
||||
|
||||
+9
-9
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user