change macroname to simplify PSI GNUmakefile

This commit is contained in:
2017-01-25 12:04:40 +01:00
parent 054b0c0e3f
commit 5a9d89822f
4 changed files with 29 additions and 56 deletions

View File

@ -7,35 +7,16 @@ EXCLUDE_VERSIONS = 3.13.2
PROJECT=stream
BUILDCLASSES += Linux
#DOCUDIR = doc
DOCUDIR = doc
BUSSES += AsynDriver
BUSSES += Dummy
PCRE=1
ASYN=1
-include src/CONFIG_STREAM
FORMATS += Enum
FORMATS += BCD
FORMATS += Raw
FORMATS += RawFloat
FORMATS += Binary
FORMATS += Checksum
FORMATS += Regexp
FORMATS += MantissaExponent
FORMATS += Timestamp
RECORDTYPES += aai aao
RECORDTYPES += ao ai
RECORDTYPES += bo bi
RECORDTYPES += mbbo mbbi
RECORDTYPES += mbboDirect mbbiDirect
RECORDTYPES += longout longin
RECORDTYPES += stringout stringin
RECORDTYPES += waveform
SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
SOURCES += $(RECORDS:%=src/dev%Stream.c)
SOURCES += $(FORMATS:%=src/%Converter.cc)
SOURCES += $(BUSSES:%=src/%Interface.cc)
SOURCES += $(wildcard src/Stream*.cc)
SOURCES += src/StreamVersion.c
SOURCES += $(STREAM_SRCS:%=src/%)
HEADERS += devStream.h
HEADERS += StreamFormat.h
@ -43,10 +24,6 @@ HEADERS += StreamFormatConverter.h
HEADERS += StreamBuffer.h
HEADERS += StreamError.h
ifneq (${EPICS_BASETYPE},3.13)
RECORDTYPES += calcout
endif
StreamCore.o: streamReferences
streamReferences:
@ -58,4 +35,3 @@ streamSup.dbd:
@echo Creating $@
perl ../src/makedbd.pl $(RECORDTYPES) > $@
endif

View File

@ -3,17 +3,17 @@
# You may add more record interfaces
# This requires the naming conventions
# dev$(RECORD)Stream.c
# dev$(RECORDTYPE)Stream.c
RECORDS += ao ai
RECORDS += bo bi
RECORDS += mbbo mbbi
RECORDS += mbboDirect mbbiDirect
RECORDS += longout longin
RECORDS += stringout stringin
RECORDS += waveform
RECORDS += calcout
RECORDS += aai aao
RECORDTYPES += ao ai
RECORDTYPES += bo bi
RECORDTYPES += mbbo mbbi
RECORDTYPES += mbboDirect mbbiDirect
RECORDTYPES += longout longin
RECORDTYPES += stringout stringin
RECORDTYPES += waveform
RECORDTYPES += calcout
RECORDTYPES += aai aao
# Do you have synApps and want support for scalcout?
# Then define CALC or SYNAPPS in your RELEASE file
@ -23,16 +23,18 @@ RECORDS += aai aao
# modules before building 'calc'.
# See doc/scalcout.html for a required fix in scalcout.
SYNAPPS_RECORDS += scalcout
SYNAPPS_RECORDTYPES += scalcout
# You may add more bus interfaces
# This requires the naming convention
# $(BUS)Interface.cc
# asynDriver interface is added automatically
# if ASYN is defined in your RELEASE file.
# asynDriver interface is added if ASYN is defined in your RELEASE file.
BUSSES += Debug
BUSSES += Dummy
ifdef ASYN
BUSSES += AsynDriver
endif
# You may add more format converters
# This requires the naming convention

View File

@ -40,13 +40,8 @@ DBD += $(LIBRARY_DEFAULT).dbd
ifdef ASYN
LIB_LIBS += asyn
BUSSES += AsynDriver
endif
ifdef T_A
ifndef BUSSES
$(error No bus interface defined! Didn't you set ASYN in your RELEASE file?)
endif
else
$(warning Asyn not included! Didn't you set ASYN in your RELEASE file?)
endif
ifeq ($(LOADABLE_MODULE),YES)
@ -54,7 +49,7 @@ SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
endif
SRCS += $(BUSSES:%=%Interface.cc)
SRCS += $(FORMATS:%=%Converter.cc)
SRCS += $(RECORDS:%=dev%Stream.c)
SRCS += $(RECORDTYPES:%=dev%Stream.c)
SRCS += $(STREAM_SRCS)
# find system wide or local PCRE header and library
@ -89,9 +84,9 @@ streamReferences: ../CONFIG_STREAM
$(PERL) ../makeref.pl Interface $(BUSSES) > $@
$(PERL) ../makeref.pl Converter $(FORMATS) >> $@
# create stream.dbd from all RECORDS
# create stream.dbd from all RECORDTYPES
$(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../CONFIG_STREAM
$(PERL) ../makedbd.pl $(RECORDS) > $@
$(PERL) ../makedbd.pl $(RECORDTYPES) > $@
$(LIBRARY_DEFAULT).dbd$(DEP): ../CONFIG_STREAM
echo $(LIBRARY_DEFAULT).dbd: $< > $@

View File

@ -12,12 +12,12 @@ DBD += $(LIBRARY_DEFAULT).dbd
ifeq ($(LOADABLE_MODULE),YES)
SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
endif
SRCS += $(SYNAPPS_RECORDS:%=dev%Stream.c)
SRCS += $(SYNAPPS_RECORDTYPES:%=dev%Stream.c)
LIB_LIBS += stream $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES
# create streamSynApps.dbd from all SYNAPPS_RECORDS
# create streamSynApps.dbd from all SYNAPPS_RECORDTYPES
$(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../../src/CONFIG_STREAM
$(PERL) ../../src/makedbd.pl $(SYNAPPS_RECORDS) > $@
$(PERL) ../../src/makedbd.pl $(SYNAPPS_RECORDTYPES) > $@