From 1781e051b099e483fbac316cbd502f1ed6f0de75 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Mar 2014 18:12:23 -0500 Subject: [PATCH] Split pvAccessApp/Makefile into fragments. --- pvAccessApp/Makefile | 120 +++++------------------------- pvAccessApp/ca/Makefile | 9 +++ pvAccessApp/client/Makefile | 7 ++ pvAccessApp/factory/Makefile | 6 ++ pvAccessApp/mb/Makefile | 7 ++ pvAccessApp/pva/Makefile | 10 +++ pvAccessApp/remote/Makefile | 24 ++++++ pvAccessApp/remoteClient/Makefile | 7 ++ pvAccessApp/rpcClient/Makefile | 7 ++ pvAccessApp/rpcService/Makefile | 9 +++ pvAccessApp/server/Makefile | 17 +++++ pvAccessApp/utils/Makefile | 19 +++++ pvAccessApp/v3ioc/Makefile | 11 +++ 13 files changed, 152 insertions(+), 101 deletions(-) create mode 100644 pvAccessApp/ca/Makefile create mode 100644 pvAccessApp/client/Makefile create mode 100644 pvAccessApp/factory/Makefile create mode 100644 pvAccessApp/mb/Makefile create mode 100644 pvAccessApp/pva/Makefile create mode 100644 pvAccessApp/remote/Makefile create mode 100644 pvAccessApp/remoteClient/Makefile create mode 100644 pvAccessApp/rpcClient/Makefile create mode 100644 pvAccessApp/rpcService/Makefile create mode 100644 pvAccessApp/server/Makefile create mode 100644 pvAccessApp/utils/Makefile create mode 100644 pvAccessApp/v3ioc/Makefile diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile index 405c85a..567aa5f 100644 --- a/pvAccessApp/Makefile +++ b/pvAccessApp/Makefile @@ -1,112 +1,30 @@ TOP = .. include $(TOP)/configure/CONFIG -PVACCESS = $(TOP)/pvAccessApp -USR_CXXFLAGS_RTEMS = -D__rtems__ +PVACCESSAPP = $(TOP)/pvAccessApp -SRC_DIRS += $(PVACCESS)/pva -INC += pvaConstants.h -INC += pvaVersion.h -INC += clientFactory.h -LIBSRCS += pvaVersion.cpp -LIBSRCS += clientFactory.cpp - - -SRC_DIRS += $(PVACCESS)/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 -LIBSRCS += hexDump.cpp -LIBSRCS += inetAddressUtil.cpp -LIBSRCS += logger.cpp -LIBSRCS += introspectionRegistry.cpp -LIBSRCS += configuration.cpp -LIBSRCS += referenceCountingLock.cpp - -SRC_DIRS += $(PVACCESS)/client -INC += pvAccess.h -LIBSRCS += pvAccess.cpp - -SRC_DIRS += $(PVACCESS)/factory -LIBSRCS += ChannelAccessFactory.cpp -LIBSRCS += CreateRequestFactory.cpp - -SRC_DIRS += $(PVACCESS)/remote -INC += remote.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 -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 - -SRC_DIRS += $(PVACCESS)/remoteClient -INC += clientContextImpl.h -LIBSRCS += clientContextImpl.cpp - -SRC_DIRS += $(PVACCESS)/server -INC += serverContext.h -INC += responseHandlers.h -INC += serverChannelImpl.h -INC += baseChannelRequester.h -INC += beaconEmitter.h -INC += beaconServerStatusProvider.h -LIBSRCS += responseHandlers.cpp -LIBSRCS += serverContext.cpp -LIBSRCS += serverChannelImpl.cpp -LIBSRCS += baseChannelRequester.cpp -LIBSRCS += beaconEmitter.cpp -LIBSRCS += beaconServerStatusProvider.cpp - -SRC_DIRS += $(PVACCESS)/rpcService -INC += rpcService.h -INC += rpcServer.h -LIBSRCS += rpcService.cpp -LIBSRCS += rpcServer.cpp - -SRC_DIRS += $(PVACCESS)/rpcClient -INC += rpcClient.h -LIBSRCS += rpcClient.cpp - -SRC_DIRS += $(PVACCESS)/ca -INC += caProvider.h -INC += caChannel.h -LIBSRCS += caProvider.cpp -LIBSRCS += caChannel.cpp - -SRC_DIRS += $(PVACCESS)/mb -INC += pvAccessMB.h -LIBSRCS += pvAccessMB.cpp - -SRC_DIRS += $(PVACCESS)/v3ioc -INC += syncChannelFind.h -DBD += PVAServerRegister.dbd -DBD += PVAClientRegister.dbd -LIBSRCS += PVAServerRegister.cpp -LIBSRCS += PVAClientRegister.cpp +include $(PVACCESSAPP)/pva/Makefile +include $(PVACCESSAPP)/utils/Makefile +include $(PVACCESSAPP)/client/Makefile +include $(PVACCESSAPP)/factory/Makefile +include $(PVACCESSAPP)/remote/Makefile +include $(PVACCESSAPP)/remoteClient/Makefile +include $(PVACCESSAPP)/server/Makefile +include $(PVACCESSAPP)/rpcService/Makefile +include $(PVACCESSAPP)/rpcClient/Makefile +include $(PVACCESSAPP)/ca/Makefile +include $(PVACCESSAPP)/mb/Makefile +include $(PVACCESSAPP)/v3ioc/Makefile LIBRARY = pvAccess -pvAccess_LIBS += Com + pvAccess_LIBS += pvData pvAccess_LIBS += ca -# needed for 64-bit Windows +pvAccess_LIBS += Com + +# needed for Windows pvAccess_SYS_LIBS_WIN32 += ws2_32 +USR_CXXFLAGS_RTEMS = -D__rtems__ + include $(TOP)/configure/RULES diff --git a/pvAccessApp/ca/Makefile b/pvAccessApp/ca/Makefile new file mode 100644 index 0000000..f76a954 --- /dev/null +++ b/pvAccessApp/ca/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/ca + +INC += caProvider.h +INC += caChannel.h + +LIBSRCS += caProvider.cpp +LIBSRCS += caChannel.cpp diff --git a/pvAccessApp/client/Makefile b/pvAccessApp/client/Makefile new file mode 100644 index 0000000..0e5c11c --- /dev/null +++ b/pvAccessApp/client/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/client + +INC += pvAccess.h + +LIBSRCS += pvAccess.cpp diff --git a/pvAccessApp/factory/Makefile b/pvAccessApp/factory/Makefile new file mode 100644 index 0000000..dc14111 --- /dev/null +++ b/pvAccessApp/factory/Makefile @@ -0,0 +1,6 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/factory + +LIBSRCS += ChannelAccessFactory.cpp +LIBSRCS += CreateRequestFactory.cpp diff --git a/pvAccessApp/mb/Makefile b/pvAccessApp/mb/Makefile new file mode 100644 index 0000000..aba05f4 --- /dev/null +++ b/pvAccessApp/mb/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/mb + +INC += pvAccessMB.h + +LIBSRCS += pvAccessMB.cpp diff --git a/pvAccessApp/pva/Makefile b/pvAccessApp/pva/Makefile new file mode 100644 index 0000000..83221b9 --- /dev/null +++ b/pvAccessApp/pva/Makefile @@ -0,0 +1,10 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/pva + +INC += pvaConstants.h +INC += pvaVersion.h +INC += clientFactory.h + +LIBSRCS += pvaVersion.cpp +LIBSRCS += clientFactory.cpp diff --git a/pvAccessApp/remote/Makefile b/pvAccessApp/remote/Makefile new file mode 100644 index 0000000..88704f2 --- /dev/null +++ b/pvAccessApp/remote/Makefile @@ -0,0 +1,24 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/remote + +INC += remote.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 + +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 diff --git a/pvAccessApp/remoteClient/Makefile b/pvAccessApp/remoteClient/Makefile new file mode 100644 index 0000000..2302b3e --- /dev/null +++ b/pvAccessApp/remoteClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/remoteClient + +INC += clientContextImpl.h + +LIBSRCS += clientContextImpl.cpp diff --git a/pvAccessApp/rpcClient/Makefile b/pvAccessApp/rpcClient/Makefile new file mode 100644 index 0000000..f32270a --- /dev/null +++ b/pvAccessApp/rpcClient/Makefile @@ -0,0 +1,7 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/rpcClient + +INC += rpcClient.h + +LIBSRCS += rpcClient.cpp diff --git a/pvAccessApp/rpcService/Makefile b/pvAccessApp/rpcService/Makefile new file mode 100644 index 0000000..50b0107 --- /dev/null +++ b/pvAccessApp/rpcService/Makefile @@ -0,0 +1,9 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/rpcService + +INC += rpcService.h +INC += rpcServer.h + +LIBSRCS += rpcService.cpp +LIBSRCS += rpcServer.cpp diff --git a/pvAccessApp/server/Makefile b/pvAccessApp/server/Makefile new file mode 100644 index 0000000..6820075 --- /dev/null +++ b/pvAccessApp/server/Makefile @@ -0,0 +1,17 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/server + +INC += serverContext.h +INC += responseHandlers.h +INC += serverChannelImpl.h +INC += baseChannelRequester.h +INC += beaconEmitter.h +INC += beaconServerStatusProvider.h + +LIBSRCS += responseHandlers.cpp +LIBSRCS += serverContext.cpp +LIBSRCS += serverChannelImpl.cpp +LIBSRCS += baseChannelRequester.cpp +LIBSRCS += beaconEmitter.cpp +LIBSRCS += beaconServerStatusProvider.cpp diff --git a/pvAccessApp/utils/Makefile b/pvAccessApp/utils/Makefile new file mode 100644 index 0000000..d02c970 --- /dev/null +++ b/pvAccessApp/utils/Makefile @@ -0,0 +1,19 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/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 + +LIBSRCS += hexDump.cpp +LIBSRCS += inetAddressUtil.cpp +LIBSRCS += logger.cpp +LIBSRCS += introspectionRegistry.cpp +LIBSRCS += configuration.cpp +LIBSRCS += referenceCountingLock.cpp diff --git a/pvAccessApp/v3ioc/Makefile b/pvAccessApp/v3ioc/Makefile new file mode 100644 index 0000000..d0cec93 --- /dev/null +++ b/pvAccessApp/v3ioc/Makefile @@ -0,0 +1,11 @@ +# This is a Makefile fragment, see ../Makefile + +SRC_DIRS += $(PVACCESSAPP)/v3ioc + +INC += syncChannelFind.h + +DBD += PVAServerRegister.dbd +DBD += PVAClientRegister.dbd + +LIBSRCS += PVAServerRegister.cpp +LIBSRCS += PVAClientRegister.cpp