patch-pre2.0.14-final2.0 linux/scripts/Makefile

Next file: linux/.name
Previous file: linux/net/ipv4/tcp_output.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.14/linux/scripts/Makefile linux/scripts/Makefile
@@ -2,12 +2,19 @@
 HEADER=header.tk
 TAIL=tail.tk
 
-SOUNDSCRIPT=${TOPDIR}/drivers/sound/Config.in
-
-${SOUNDSCRIPT}: ${TOPDIR}/drivers/sound/configure.c
+# We allow the Makefile in drivers/sound to decide when to rebuild its
+# files, rather than trying to second-guess it like we did before.
+#
+soundscript:
 	make -C ${TOPDIR}/drivers/sound mkscript
+	@echo
 
-kconfig.tk: ${SOUNDSCRIPT} ${TOPDIR}/Makefile ../arch/${ARCH}/config.in \
+# There is probably a better way to decide when to rebuild kconfig.tk; this
+# one won't catch every last change to the various Config.in files.  However,
+# the reliance on ${TOPDIR}/Makefile makes sure we at least rebuild when the
+# kernel version number changes.
+#
+kconfig.tk: soundscript ${TOPDIR}/Makefile ${TOPDIR}/arch/${ARCH}/config.in \
 		tkparse ${HEADER} ${TAIL}
 	./tkparse < ../arch/${ARCH}/config.in  > kconfig.tmp
 	@if [ -f /usr/local/bin/wish ];	then \


FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this