Merge branch 'rf/depend' into 'master'

RF: Go back to having depend.mk logic inline, rather than in separate script

See merge request !42

CHANGELOG.md

 # FSL base project changelog
 
 
+## 2112.3 (Monday 13th December 2021)
+
+* Fixed an issue with variable quoting in the `depend.mk` rule.
+
+
 ## 2112.2 (Monday 13th December 2021)
 
 * Fixed installation permissions on the `$FSLDIR/config/depend.sh` script.

Makefile

@@ -19,7 +19,6 @@ install:
 	${INSTALL} -m 0755 bin/*                       ${PREFIX}/share/fsl/bin/
 	${INSTALL} -m 0644 config/*                    ${PREFIX}/config/
 	${INSTALL} -m 0755 config/supportedGencodes.sh ${PREFIX}/config/
-	${INSTALL} -m 0755 config/depend.sh            ${PREFIX}/config/
 	${INSTALL} -m 0644 doc/fsl.css                 ${PREFIX}/doc/
 	${INSTALL} -m 0644 doc/images/*                ${PREFIX}/doc/images/
 	${INSTALL} -m 0644 etc/fslconf/*               ${PREFIX}/etc/fslconf/

config/depend.sh

-#!/bin/sh
-#
-# This script is called by the depend.mk rule defined in
-# $FSLDIR/config/rules.mk.
-#
-# It is assumed that this script is executed from a
-# project directory (i.e. the project directory is the cwd).
-#
-# Automatically generate Make rules and dependencies for
-# all source files in the project. This creates a file
-# called depend.mk which contains a rule for every object
-# file to be compiled, which has all header files
-# that the source file includes as dependencies. If
-# object files are to be saved into a separate build
-# directory, the project Makefile should set the BUILDDIR
-# variable.
-#
-# If the NVCC environment variable is set to a nvcc compiler,
-# rules are generated for CUDA .cu files. If CUDA object files
-# are to be saved into a separate build directory, the project
-# Makefile should set the CUDABUILDDIR variable.
-set -e
-
-echo "Building dependency file depend.mk"
-
-srcfiles=`find -name "*.c"  -or -name "*.cc"  -or -name "*.cxx" -or -name "*.cpp" -or -name "*.inc" -or -name "*.hpp" -or -name "*.cu"`
-
-for srcfile in ${srcfiles} dummyname; do
-
-  if [ -f "${srcfile}" ]; then
-    srcfile="${srcfile#./}"
-    prefix="${srcfile%.*}"
-    basename="${prefix##*/}"
-    objfile="${basename}.o"
-    depfile="${basename}.mk"
-
-    # if nvcc is present, use it for .cu files
-    if [ "${srcfile%.cu}" = "${prefix}" ]; then
-      if [ -f "${NVCC}" ]; then
-        ${NVCC} -MM -MT "${CUDABUILDDIR}${objfile}" -MF "${depfile}" \
-                ${CPPFLAGS} ${INCFLAGS} "${srcfile}" > /dev/null 2>&1
-      fi
-    else
-      ${CC} -MM -MT "${BUILDDIR}${objfile}" -MF "${depfile}" \
-            ${CPPFLAGS} ${INCFLAGS} "${srcfile}" > /dev/null 2>&1
-    fi
-    if [ -f "${depfile}" ]; then
-      cat "${depfile}" >> depend.mk
-      rm -f "${depfile}"
-    fi
-
-  else
-    touch depend.mk
-  fi
-done

config/rules.mk

@@ -20,15 +20,46 @@ depend:
 	${RM} -f depend.mk
 	${MAKE} depend.mk
 
+# Automatically generate Make rules and dependencies for
+# all source files in the project. This creates a file
+# called depend.mk which contains a rule for every object
+# file to be compiled, which has all header files
+# that the source file includes as dependencies. If
+# object files are to be saved into a separate build
+# directory, the project Makefile should set the BUILDDIR
+# variable.
+#
+# If the NVCC environment variable is set to a nvcc compiler,
+# rules are generated for CUDA .cu files. If CUDA object files
+# are to be saved into a separate build directory, the project
+# Makefile should set the CUDABUILDDIR variable.
 depend.mk:
-	@NVCC="${NVCC}"                 \
-     CC="${CC}"                     \
-     CPPFLAGS="${CPPFLAGS}"         \
-     INCFLAGS="${INCFLAGS}"         \
-     BUILDDIR="${BUILDDIR}"         \
-     CUDABUILDDIR="${CUDABUILDDIR}" \
-     ${FSLCONFDIR}/depend.sh
-
+	echo "Building dependency file depend.mk" ; \
+	srcfiles=`find -name "*.c"  -or -name "*.cc"  -or -name "*.cxx" -or -name "*.cpp" -or -name "*.inc" -or -name "*.hpp" -or -name "*.cu"` ; \
+	for srcfile in ${srcfiles} dummyname; do                                \
+	  if [ -f "${srcfile}" ]; then                                          \
+	    srcfile="${srcfile#./}"                                           ; \
+	    prefix="${srcfile%.*}"                                            ; \
+	    basename="${prefix##*/}"                                          ; \
+	    objfile="${basename}.o"                                           ; \
+	    depfile="${basename}.mk"                                          ; \
+	    if [ "${srcfile%.cu}" = "${prefix}" ]; then                         \
+	      if [ -f "${NVCC}" ]; then                                         \
+	        ${NVCC} -MM -MT "${CUDABUILDDIR}${objfile}" -MF "${depfile}"    \
+	                ${CPPFLAGS} ${INCFLAGS} "${srcfile}" > /dev/null 2>&1 ; \
+	      fi                                                              ; \
+	    else                                                                \
+	      ${CC} -MM -MT "${BUILDDIR}${objfile}" -MF "${depfile}"            \
+	            ${CPPFLAGS} ${INCFLAGS} "${srcfile}" > /dev/null 2>&1     ; \
+	    fi                                                                ; \
+	    if [ -f "${depfile}" ]; then                                        \
+	      cat "${depfile}" >> depend.mk                                   ; \
+	      rm -f "${depfile}"                                              ; \
+	    fi                                                                ; \
+	  else                                                                  \
+	    touch depend.mk                                                   ; \
+	  fi                                                                  ; \
+	done
 
 install:
 	@${MAKE} "DESTDIR=${FSLDEVDIR}" master-install-script