From ea3f58d5b8d62babf8470c29a2a53374b313d5b2 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 4 Nov 2021 13:36:48 +0100
Subject: [PATCH] Improve debug log for module building

---
 require-ess/tools/driver.makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index bf7574ed..bc82e97d 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -216,6 +216,7 @@ help:
 	@echo "  <module>_VERSION () [build against specific version of other module]"
 
 debug::
+	@echo "===================== Pass 1 ====================="
 	@echo "BUILD_EPICS_VERSIONS = ${BUILD_EPICS_VERSIONS}"
 	@echo "BUILDCLASSES = ${BUILDCLASSES}"
 	@echo "LIBVERSION = ${LIBVERSION}"
@@ -404,8 +405,8 @@ uninstall::
 	$(RMDIR) ${INSTALL_REV}
 
 debug::
+	@echo "===================== Pass 2: EPICSVERSION = $(EPICSVERSION) ====================="
 	@echo "EPICS_BASE = ${EPICS_BASE}"
-	@echo "EPICSVERSION = ${EPICSVERSION}"
 	@echo "CROSS_COMPILER_TARGET_ARCHS = ${CROSS_COMPILER_TARGET_ARCHS}"
 	@echo "EXCLUDE_ARCHS = ${EXCLUDE_ARCHS}"
 	@echo "LIBVERSION = ${LIBVERSION}"
@@ -425,6 +426,11 @@ ifeq ($(filter O.%,$(notdir ${CURDIR})),)
 ## RUN 3
 # Target architecture defined.
 # Still in source directory, third run.
+debug::
+	@echo "===================== Pass 3: T_A = $(T_A) ====================="
+	@echo "BINS = $(BINS)"
+	@echo "REQ = $(REQ)"
+	@echo "VLIBS = $(VLIBS)"
 
 ifeq ($(filter ${OS_CLASS},${OS_CLASS_LIST}),)
 
@@ -621,9 +627,9 @@ LIBOBJS += $(addsuffix $(OBJ),$(basename ${VERSIONFILE}))
 endif # MODULELIB
 
 debug::
+	@echo "===================== Pass 4: Build directory ====================="
 	@echo "BUILDCLASSES = ${BUILDCLASSES}"
 	@echo "OS_CLASS = ${OS_CLASS}"
-	@echo "T_A = ${T_A}"
 	@echo "MODULEDBD = ${MODULEDBD}"
 	@echo "RECORDS = ${RECORDS}"
 	@echo "MENUS = ${MENUS}"
-- 
GitLab