epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure CONFIG_PVXS_MODULE is idempotent

Browse Source 
seems that cfg/ files can sometimes be included
multiple times.
This commit is contained in:
Michael Davidsaver
2020-03-18 21:12:59 -07:00
parent 39c7eb39fe
commit ceeb782e8a
5 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/CONFIG_PVXS_MODULE
+6
View File
@@ -1,6 +1,10 @@
# auto-compute. avoid need to standardize configure/RELEASE name
_PVXS := $(dir $(lastword $(MAKEFILE_LIST)))
# as we're appending, must be idempotent
ifeq (,$(_PVXS_INCLUDED))
_PVXS_INCLUDED := YES
ifdef T_A
# use custom libevent2 install prefix by:
@@ -35,3 +39,5 @@ LIB_SYS_LIBS += $(LIBEVENT_SYS_LIBS)
endif # T_A
endif # _PVXS_INCLUDED
example/Makefile
+4
View File
@@ -1,6 +1,10 @@
TOP=..
include $(TOP)/configure/CONFIG
# cfg/ sometimes isn't correctly included due to a Base bug
# so we do here (maybe again) as workaround
include $(TOP)/configure/CONFIG_PVXS_MODULE
include $(TOP)/configure/CONFIG_PVXS_VERSION
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
src/Makefile
+4
View File
@@ -1,6 +1,10 @@
TOP=..
include $(TOP)/configure/CONFIG
# cfg/ sometimes isn't correctly included due to a Base bug
# so we do here (maybe again) as workaround
include $(TOP)/configure/CONFIG_PVXS_MODULE
include $(TOP)/configure/CONFIG_PVXS_VERSION
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
test/Makefile
+4
View File
@@ -1,6 +1,10 @@
TOP=..
include $(TOP)/configure/CONFIG
# cfg/ sometimes isn't correctly included due to a Base bug
# so we do here (maybe again) as workaround
include $(TOP)/configure/CONFIG_PVXS_MODULE
include $(TOP)/configure/CONFIG_PVXS_VERSION
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
tools/Makefile
+4
View File
@@ -1,6 +1,10 @@
TOP=..
include $(TOP)/configure/CONFIG
# cfg/ sometimes isn't correctly included due to a Base bug
# so we do here (maybe again) as workaround
include $(TOP)/configure/CONFIG_PVXS_MODULE
include $(TOP)/configure/CONFIG_PVXS_VERSION
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================