From 68da54a450bc3d390077cdd16823563f90b630e2 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 22 Feb 2021 14:49:47 +0100
Subject: [PATCH] First attempt to allow using cellMods for header files
---
require-ess/tools/driver.makefile | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index df17899c..b33d5122 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -546,6 +546,7 @@ EPICS_INCLUDES =
# INSTALL_INCLUDES += $$(patsubst %,-I${EPICS_MODULES}/$(1)/%/include,$$($(1)_VERSION))
# endef
# $(eval $(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${EPICS_MODULES}/*))),$(call ADD_FOREIGN_INCLUDES,$m)))
+ifneq ($(strip $(PRJ)),require)
define FETCH_BUILD_NUMBER
$(shell $(E3_REQUIRE_TOOLS)/build_number.sh $(1) $(2) $($(2)_VERSION))
@@ -561,6 +562,13 @@ INSTALL_INCLUDES += $$(patsubst %,-I${E3_SITEAPPS_PATH}/$(1)/%/include,$$(call F
endef
$(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${E3_SITEAPPS_PATH}/*))),$(eval $(call ADD_SITEAPPS_INCLUDES,$m)))
+define ADD_OTHER_INCLUDES
+INSTALL_INCLUDES += $$(patsubst %,-I${EPICS_MODULES}/$(1)/%/include,$$(call FETCH_BUILD_NUMBER,$(EPICS_MODULES),$(1)))
+endef
+$(foreach m,$(filter-out $(PRJ),$(notdir $(wildcard ${EPICS_MODULES}/*))),$(eval $(call ADD_OTHER_INCLUDES,$m)))
+
+endif
+
BASERULES=${EPICS_BASE}/configure/RULES
INSTALL_REV = ${MODULE_LOCATION}
--
GitLab