[Scummvm-git-logs] scummvm master -> ea66b91939c6d1e88a8f3a89b7a362bfbdd946d1

[orgads]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ea66b91939 CONFIGURE: Force full rebuild on configuration change (#2974)


Commit: ea66b91939c6d1e88a8f3a89b7a362bfbdd946d1
    https://github.com/scummvm/scummvm/commit/ea66b91939c6d1e88a8f3a89b7a362bfbdd946d1
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-23T12:34:02+03:00

Commit Message:
CONFIGURE: Force full rebuild on configuration change (#2974)

When a subengine is added, its parent engine needs to be rebuilt.

A real solution will be to create a make-dependency file for each engine,
and touch it when its subengines change, but for now we'll just rebuild
everything.

Changed paths:
    configure


diff --git a/configure b/configure
index a612893367..b547ea69ae 100755
--- a/configure
+++ b/configure
@@ -747,11 +747,15 @@ show_subengine_help() {
 }
 
 # Copy first argument to second one if they are different. Otherwise, delete the first one.
+# Touch the optional third argument on change
 copy_if_changed() {
 	if cmp -s $1 $2; then
 		rm -f $1
 	else
 		mv -f $1 $2
+		if test -n "$3" ; then
+			touch "$3"
+		fi
 	fi
 }
 
@@ -6122,7 +6126,7 @@ $_mak_plugins
 port_mk = $_port_mk
 EOF
 rm -f config.mk.engines
-copy_if_changed config.mk.new config.mk
+copy_if_changed config.mk.new config.mk config.h
 
 #
 # Create a custom Makefile when building outside the source tree