[gtk/more-vs-proj-updates: 3/3] win32/bootstrap-msvc.mak: Generate broadway headers

[Chun-wei Fan <fanchunwei src gnome org>]

commit c12d6a19ec310964948ee2891c1216c6927169f7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Aug 5 16:27:57 2022 +0800

    win32/bootstrap-msvc.mak: Generate broadway headers
    
    This is also needed for the bootstrapping process, since these headers
    are currently dist'ed.

 win32/bootstrap-msvc.mak | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/win32/bootstrap-msvc.mak b/win32/bootstrap-msvc.mak
index 97a97e58e0..234aabb480 100644
--- a/win32/bootstrap-msvc.mak
+++ b/win32/bootstrap-msvc.mak
@@ -6,8 +6,11 @@
 !ifndef PYTHON
 PYTHON=python
 !endif
+!ifndef PERL
+PERL=perl
+!endif
 
-NMAKE_ARGS = PYTHON=$(PYTHON)
+NMAKE_ARGS = PYTHON=$(PYTHON) PERL=$(PERL)
 !ifdef USE_EGL
 NMAKE_ARGS = $(NMAKE_ARGS) USE_EGL=$(USE_EGL)
 !endif
@@ -18,6 +21,12 @@ NMAKE_ARGS = $(NMAKE_ARGS) FONT_FEATURES_DEMO=$(FONT_FEATURES_DEMO)
 NMAKE_ARGS = $(NMAKE_ARGS) FONT_FEATURES_USE_PANGOFT2=$(FONT_FEATURES_USE_PANGOFT2)
 !endif
 
+GENERATED_ITEMS =      \
+       config-msvc.mak \
+       ..\config.h.win32       \
+       vs9\gtk3-version-paths.vsprops  \
+       vs1x-props\gtk3-version-paths.props
+
 all: bootstrap-msvc-projects
 
 config-msvc.mak: config-msvc.mak.in ..\configure.ac gen-version-items.py
@@ -25,23 +34,22 @@ config-msvc.mak: config-msvc.mak.in ..\configure.ac gen-version-items.py
 vs9\gtk3-version-paths.vsprops: vs9\gtk3-version-paths.vsprops.in ..\configure.ac gen-version-items.py
 vs1x-props\gtk3-version-paths.props: vs1x-props\gtk3-version-paths.props.in ..\configure.ac 
gen-version-items.py
 
-config-msvc.mak ..\config.h.win32      \
-vs9\gtk3-version-paths.vsprops vs1x-props\gtk3-version-paths.props:
-       @echo Generating $@...
-       @$(PYTHON) .\gen-version-items.py --source=$@.in -o=$@
-
-bootstrap-msvc-projects:       \
 config-msvc.mak        \
 ..\config.h.win32      \
 vs9\gtk3-version-paths.vsprops \
-vs1x-props\gtk3-version-paths.props
-       $(MAKE) /f generate-msvc.mak $(NMAKE_ARGS) regenerate-all-msvc-projs
+vs1x-props\gtk3-version-paths.props:
+       @echo Generating $@...
+       @$(PYTHON) .\gen-version-items.py --source=$@.in -o=$@
+
+bootstrap-msvc-projects: $(GENERATED_ITEMS)
+       $(MAKE) /f generate-msvc.mak $(NMAKE_ARGS) generate-broadway-items regenerate-all-msvc-projs
 
 clean:
        @-for %%v in (11 12 14 15 16 17) do @for %%x in (sln vcxproj vcxproj.filters) do @del vs%%v\*.%%x
        @for %%x in (vcxproj vcxproj.filters) do @for %%f in (vs10\*.%%x) do @if exist %%fin del %%f
        @for %%x in (vcxproj vcxproj.filters) do @for %%f in (vs10\*.%%x) do @if exist %%fin del %%f
        @for %%x in (vcproj) do @for %%f in (vs9\*.%%x) do @if exist %%fin del %%f
+       @-del ..\gdk\broadway\broadwayjs.h ..\gdk\broadway\clienthtml.h
        @-del ..\config.h.win32 config-msvc.mak
        @-del vs9\gtk3-version-paths.vsprops
        @-del vs1x-props\gtk3-version-paths.props