From 7c0aa6fd8c5ede0867b3b388d4695c7f016aac9f Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 24 Jun 2024 17:12:52 +0200
Subject: [PATCH] makefiles: Generate rules to build makedep.

---
 configure         | 16 ++--------------
 configure.ac      | 16 ++--------------
 tools/Makefile.in |  5 +++++
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/configure b/configure
index 64afddd6a51..a91ee8891e0 100755
--- a/configure
+++ b/configure
@@ -23100,7 +23100,6 @@ test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine"
 
 if test "x$enable_tools" != xno
 then
-    as_fn_append CONFIGURE_TARGETS " tools/makedep$ac_exeext"
     ac_config_commands="$ac_config_commands tools/makedep"
 
 fi
@@ -23142,18 +23141,6 @@ include/stamp-h.in: configure.ac aclocal.m4
 	@echo timestamp > \$@"
 fi
 
-if test "x$enable_tools" != xno
-then
-    as_fn_append wine_rules "
-tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status
-	@./config.status tools/makedep
-Makefile: tools/makedep$ac_exeext"
-else
-    as_fn_append wine_rules "
-\$(MAKEDEP):
-	@echo \"You need to run make in $toolsdir first\" && false"
-fi
-
 
 if test -n "$with_wine64"
 then
@@ -23905,7 +23892,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 wine_fn_output_makedep ()
 {
     as_dir=tools; as_fn_mkdir_p
-    $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
+    $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c
+    $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS
 }
 wine_fn_output_makefile ()
 {
diff --git a/configure.ac b/configure.ac
index 8c2f0f3e09b..2ff2e062973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3586,12 +3586,12 @@ test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine)
 
 if test "x$enable_tools" != xno
 then
-    WINE_IGNORE_FILE(tools/makedep$ac_exeext)
     AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT],
 [wine_fn_output_makedep ()
 {
     AS_MKDIR_P(tools)
-    $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS
+    $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c
+    $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS
 }])
 fi
 
@@ -3655,18 +3655,6 @@ include/stamp-h.in: configure.ac aclocal.m4
 	@echo timestamp > \$[@]])
 fi
 
-if test "x$enable_tools" != xno
-then
-    WINE_APPEND_RULE(
-[tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status
-	@./config.status tools/makedep
-Makefile: tools/makedep$ac_exeext])
-else
-    WINE_APPEND_RULE(
-[\$(MAKEDEP):
-	@echo \"You need to run make in $toolsdir first\" && false])
-fi
-
 dnl Rules for wineloader
 
 if test -n "$with_wine64"
diff --git a/tools/Makefile.in b/tools/Makefile.in
index cd643e7e90b..71bd896b8a0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,6 +1,11 @@
 PROGRAMS = \
+	makedep \
 	make_xftmpl
 
 SOURCES = \
+	makedep.c \
 	make_xftmpl.c \
 	wineapploader.in
+
+makedep_OBJS = makedep.o
+make_xftmpl_OBJS = make_xftmpl.o