Split pvAccessApp/Makefile into fragments.

2014-03-27 18:12:23 -05:00
parent ce2ad6e2ab
commit 1781e051b0
13 changed files with 152 additions and 101 deletions
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVACCESSAPP)/client
+
+INC += pvAccess.h
+
+LIBSRCS += pvAccess.cpp
@@ -0,0 +1,6 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVACCESSAPP)/factory
+
+LIBSRCS += ChannelAccessFactory.cpp
+LIBSRCS += CreateRequestFactory.cpp
@@ -0,0 +1,7 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVACCESSAPP)/mb
+
+INC += pvAccessMB.h
+
+LIBSRCS += pvAccessMB.cpp
@@ -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
@@ -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
@@ -0,0 +1,7 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVACCESSAPP)/remoteClient
+
+INC += clientContextImpl.h
+
+LIBSRCS += clientContextImpl.cpp
@@ -0,0 +1,7 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVACCESSAPP)/rpcClient
+
+INC += rpcClient.h
+
+LIBSRCS += rpcClient.cpp
@@ -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
@@ -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
@@ -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
@@ -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