EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make Makefile's compatible with newer EPICS versions

Browse Source
This commit is contained in:
zimoch
2018-06-14 11:52:41 +02:00
parent 54eb0b215c
commit 4e290413d1
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -70,6 +70,9 @@ LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
INC += devStream.h INC += devStream.h
# switch off annoying rset warnings in 3.16+
CPPFLAGS += -DUSE_TYPED_RSET
include $(TOP)/configure/RULES include $(TOP)/configure/RULES
# Update version string (contains __DATE__ and __TIME__) # Update version string (contains __DATE__ and __TIME__)

9
streamApp/Makefile
View File

@ -18,7 +18,9 @@ streamApp_DBD += base.dbd
# In 3.14.12 aaiRecord.dbd and aaoRecord.dbd are part of base.dbd # In 3.14.12 aaiRecord.dbd and aaoRecord.dbd are part of base.dbd
# In earlier versions, these records are buggy and not included by default # In earlier versions, these records are buggy and not included by default
ifndef BASE_3_15
streamApp_DBD += aaiRecord.dbd aaoRecord.dbd streamApp_DBD += aaiRecord.dbd aaoRecord.dbd
endif
PROD_SRCS += streamApp_registerRecordDeviceDriver.cpp PROD_SRCS += streamApp_registerRecordDeviceDriver.cpp
PROD_SRCS_DEFAULT = streamAppMain.cc PROD_SRCS_DEFAULT = streamAppMain.cc
@ -62,9 +64,16 @@ PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
# If unset output goes to stdout # If unset output goes to stdout
CPPFLAGS += -DDEBUGFILE=StreamDebug.log CPPFLAGS += -DDEBUGFILE=StreamDebug.log
# switch off annoying rset warnings in 3.16+
CPPFLAGS += -DUSE_TYPED_RSET
include $(TOP)/configure/RULES include $(TOP)/configure/RULES
ifdef BASE_3_15
clean:
else
clean:: clean::
endif
$(RM) core* StreamDebug.log $(RM) core* StreamDebug.log
endif endif