EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

change make to build only one library

Browse Source
This commit is contained in:
Matej Sekoranja
2010-12-19 15:25:51 +01:00
parent 510d3766a3
commit a18f7f54a5
9 changed files with 45 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure/RELEASE
View File

@ -27,6 +27,8 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
# EPICS_BASE usually appears last so other apps can override stuff: # EPICS_BASE usually appears last so other apps can override stuff:
EPICS_BASE=/opt/epics/base EPICS_BASE=/opt/epics/base
PVDATA_HOME=/opt/epics/pvDataCPP
# Set RULES here if you want to take build rules from somewhere # Set RULES here if you want to take build rules from somewhere
# other than EPICS_BASE: # other than EPICS_BASE:
#RULES=/path/to/epics/support/module/rules/x-y #RULES=/path/to/epics/support/module/rules/x-y

2
configure/RULES
View File

@ -2,7 +2,5 @@
include $(CONFIG)/RULES include $(CONFIG)/RULES
USR_INCLUDES += -I$(PVDATA_HOME)/include
# Library should be rebuilt because LIBOBJS may have changed. # Library should be rebuilt because LIBOBJS may have changed.
$(LIBNAME): ../Makefile $(LIBNAME): ../Makefile

42
pvAccessApp/Makefile
View File

@ -1,9 +1,39 @@
TOP = .. TOP = ..
include $(TOP)/configure/CONFIG include $(TOP)/configure/CONFIG
DIRS += ca
DIRS += utils
DIRS += client #server
#DIRS += localImpl remoteClientImpl remoteServerImpl
#DIRS += localImplTest remoteImplTest
include $(TOP)/configure/RULES_DIRS
PVACCESS = $(TOP)/pvAccessApp/
SRC_DIRS += $(PVACCESS)/ca
INC += caConstants.h
INC += version.h
LIBSRCS += version.cpp
SRC_DIRS += $(PVACCESS)/utils
INC += hexDump.h
INC += wildcharMatcher.h
INC += arrayFIFO.h
INC += growingCircularBuffer.h
INC += inetAddressUtil.h
INC += logger.h
LIBSRCS += hexDump.cpp
LIBSRCS += wildcharMatcher.cpp
LIBSRCS += inetAddressUtil.cpp
LIBSRCS += logger.cpp
SRC_DIRS += $(PVACCESS)/client
INC += pvAccess.h
SRC_DIRS += $(PVACCESS)/factory
LIBSRCS += ChannelAccessFactory.cpp
LIBRARY = pvAccess
pvAccess_LIBS += Com
include $(TOP)/configure/RULES

17
pvAccessApp/ca/Makefile
View File

@ -1,17 +0,0 @@
TOP=../..
include $(TOP)/configure/CONFIG
INC += caConstants.h
INC += version.h
LIBSRCS += version.cpp
LIBRARY = pvAccess
#pvMisc_LIBS += Com
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

17
pvAccessApp/client/Makefile
View File

@ -1,17 +0,0 @@
TOP=../..
include $(TOP)/configure/CONFIG
INC += pvAccess.h
LIBSRCS += ChannelAccessFactory.cpp
LIBRARY=pvAccessClient
pvAccessClient_LIBS += pvData
pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

0
pvAccessApp/client/ChannelAccessFactory.cpp → pvAccessApp/factory/ChannelAccessFactory.cpp
View File

26
pvAccessApp/utils/Makefile
View File

@ -1,26 +0,0 @@
TOP=../..
include $(TOP)/configure/CONFIG
INC += hexDump.h
INC += wildcharMatcher.h
INC += arrayFIFO.h
INC += growingCircularBuffer.h
INC += inetAddressUtil.h
INC += logger.h
LIBSRCS += hexDump.cpp
LIBSRCS += wildcharMatcher.cpp
LIBSRCS += inetAddressUtil.cpp
LIBSRCS += logger.cpp
LIBRARY = pvAccessUtils
pvAccessUtils_LIBS += Com
pvAccessUtils_LIBS += pvData
pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

2
testApp/client/Makefile
View File

@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG
PROD_HOST += testChannelAccessFactory PROD_HOST += testChannelAccessFactory
testChannelAccessFactory_SRCS += testChannelAccessFactory.cpp testChannelAccessFactory_SRCS += testChannelAccessFactory.cpp
testChannelAccessFactory_LIBS += pvAccessClient Com testChannelAccessFactory_LIBS += pvAccess Com
include $(TOP)/configure/RULES include $(TOP)/configure/RULES
#---------------------------------------- #----------------------------------------

12
testApp/utils/Makefile
View File

@ -4,28 +4,28 @@ include $(TOP)/configure/CONFIG
PROD_HOST += hexDumpTest PROD_HOST += hexDumpTest
hexDumpTest_SRCS += hexDumpTest.cpp hexDumpTest_SRCS += hexDumpTest.cpp
hexDumpTest_LIBS += pvAccessUtils hexDumpTest_LIBS += pvAccess
PROD_HOST += wildcharMatcherTest PROD_HOST += wildcharMatcherTest
wildcharMatcherTest_SRCS += wildcharMatcherTest.cpp wildcharMatcherTest_SRCS += wildcharMatcherTest.cpp
wildcharMatcherTest_LIBS += pvAccessUtils Com wildcharMatcherTest_LIBS += pvAccess Com
PROD_HOST += arrayFIFOTest PROD_HOST += arrayFIFOTest
arrayFIFOTest_SRCS += arrayFIFOTest.cpp arrayFIFOTest_SRCS += arrayFIFOTest.cpp
arrayFIFOTest_LIBS += pvAccessUtils Com arrayFIFOTest_LIBS += pvAccess Com
PROD_HOST += growingCircularBufferTest PROD_HOST += growingCircularBufferTest
growingCircularBufferTest_SRCS += growingCircularBufferTest.cpp growingCircularBufferTest_SRCS += growingCircularBufferTest.cpp
growingCircularBufferTest_LIBS += pvAccessUtils Com growingCircularBufferTest_LIBS += pvAccess Com
PROD_HOST += inetAddressUtilsTest PROD_HOST += inetAddressUtilsTest
inetAddressUtilsTest_SRCS += inetAddressUtilsTest.cpp inetAddressUtilsTest_SRCS += inetAddressUtilsTest.cpp
inetAddressUtilsTest_LIBS += pvAccessUtils Com pvData inetAddressUtilsTest_LIBS += pvAccess Com pvData
pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH) pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
PROD_HOST += loggerTest PROD_HOST += loggerTest
loggerTest_SRCS += loggerTest.cpp loggerTest_SRCS += loggerTest.cpp
loggerTest_LIBS += pvAccessUtils Com loggerTest_LIBS += pvAccess Com
include $(TOP)/configure/RULES include $(TOP)/configure/RULES