From 71158e965b748e24e10c4184aebf4a5f592dd4bc Mon Sep 17 00:00:00 2001
From: Michael Gilbert <mgilbert@debian.org>
Date: Sat, 24 Sep 2022 18:29:03 +0100
Subject: [PATCH] regenerate all icon files

Gbp-Pq: Topic generate
Gbp-Pq: Name icons.patch
---
 dlls/comctl32/Makefile.in      |  6 +++++-
 dlls/comdlg32/Makefile.in      |  8 +++++++-
 dlls/display.drv16/Makefile.in |  2 ++
 programs/regedit/Makefile.in   |  2 +-
 programs/taskmgr/Makefile.in   |  4 +++-
 tools/makedep.c                | 14 ++++++++++++++
 6 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index c0272f2..c534b39 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -53,4 +53,8 @@ SVG_SRCS = \
 	idc_copy.svg \
 	idc_divider.svg \
 	idc_divideropen.svg \
-	idc_movebutton.svg
+	idc_movebutton.svg \
+	idi_dragarrow.svg \
+	idi_tt_info_sm.svg \
+	idi_tt_warn_sm.svg \
+	idi_tt_error_sm.svg
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index f919a26..5724245 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -20,6 +20,12 @@ SVG_SRCS = \
 	pd32_collate.svg \
 	pd32_landscape.svg \
 	pd32_nocollate.svg \
-	pd32_portrait.svg
+	pd32_portrait.svg \
+	cdrom.svg \
+	hdisk.svg \
+	floppy.svg \
+	folder.svg \
+	folder2.svg \
+	network.svg
 
 IDL_SRCS = comdlg32_classes.idl
diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in
index 533ff36..3cbc99a 100644
--- a/dlls/display.drv16/Makefile.in
+++ b/dlls/display.drv16/Makefile.in
@@ -6,3 +6,5 @@ EXTRADLLFLAGS = -m16
 C_SRCS = display.c
 
 RC_SRCS = display.rc
+
+SVG_SRCS = oic_hand.svg
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 9f8fb5a..e013c1b 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -20,4 +20,4 @@ RC_SRCS = regedit.rc
 
 MANPAGES = regedit.man.in
 
-SVG_SRCS = regedit.svg
+SVG_SRCS = regedit.svg folderopen.svg folder.svg computer.svg string.svg bin.svg
diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in
index bcc1ae3..a484b83 100644
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@@ -26,4 +26,6 @@ C_SRCS = \
 RC_SRCS = taskmgr.rc
 
 SVG_SRCS = \
-	taskmgr.svg
+	taskmgr.svg \
+	window.svg \
+	windowsm.svg
diff --git a/tools/makedep.c b/tools/makedep.c
index da9e1d1..bee3133 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1429,6 +1429,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
 
     if (pFile->type == INCL_SYSTEM) return NULL;  /* ignore system files we cannot find */
 
+    /* no reason to check that files exist here, may be built later */
+    return file;
+
     /* try in src file directory */
     if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename )))
     {
@@ -2817,6 +2820,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
 
         if (images[i])
         {
+            struct incl_file *src;
+            LIST_FOR_EACH_ENTRY( src, &make->sources, struct incl_file, entry )
+            {
+                if (strendswith( src->name, ".rc" ))
+                {
+                    char *res = replace_extension( src->name, "rc", "res" );
+                    char *res_file = src_dir_path( make, res );
+                    char *obj_file = src_dir_path( make, obj );
+                    output( "%s: %s.%s\n", res_file, obj_file, images[i] );
+                }
+            }
             output( "%s.%s: %s\n", src_dir_path( make, obj ), images[i], source->filename );
             output( "\t%sCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n",
                     cmd_prefix( "GEN" ), convert, icotool, rsvg,
-- 
2.30.2