[gtk/more-vs-proj-updates: 10/13] generate-msvc.mak: Improve gtk-demo config message

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

commit 9de6bcc1624dfa3b9582d8da631937a5242698d0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Aug 5 11:27:47 2022 +0800

    generate-msvc.mak: Improve gtk-demo config message
    
    Make the messages to show the configuration when we (re-)generate the
    demos.h.win32 and Visual Studio projects show at the beginning, and make the
    messages clearer.

 win32/generate-msvc.mak | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index cbe23bf358..f527cbd773 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -487,40 +487,46 @@ vs9\$(GDKWIN32_VS9_PROJ) vs10\$(GDKWIN32_VS1X_PROJ):
 
 !ifdef FONT_FEATURES_DEMO
 !ifdef FONT_FEATURES_USE_PANGOFT2
+DEMO_MSG = with font features demo using PangoFT2
 vs9\$(DEMO_VS9_PROJ):
-       @echo Generating $@...
+       @echo (Re-)Generating $@ $(DEMO_MSG)...
        @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@       \
        --instring="AdditionalDependencies=\"\""        \
        --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9)\""
        @-del $**
 
 vs10\$(DEMO_VS1X_PROJ):
-       @echo Generating $@...
+       @echo (Re-)Generating $@ $(DEMO_MSG)...
        @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@       \
        --instring=">%(AdditionalDependencies)<"        \
        --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<"
        @-del $**
 !else
+DEMO_MSG = with font features demo
 vs9\$(DEMO_VS9_PROJ):
-       @echo Generating $@...
+       @echo (Re-)Generating $@ $(DEMO_MSG)...
        @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@       \
        --instring="AdditionalDependencies=\"\""        \
        --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_NEW_PANGO)\""
        @-del $**
 
 vs10\$(DEMO_VS1X_PROJ):
-       @echo Generating $@...
+       @echo (Re-)Generating $@ $(DEMO_MSG)...
        @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@       \
        --instring=">%(AdditionalDependencies)<"        \
        --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<"
        @-del $**
 !endif
 !else
+DEMO_MSG = without font features demo
 vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS1X_PROJ):
-       @echo Renaming $** to $@...
+       @echo (Re-)Generating $@ $(DEMO_MSG)...
        @move $** $@
 !endif
 
+regenerate-demos-h-win32-msg:
+       @echo (Re-)Generating demos.h.win32 $(DEMO_MSG)...
+
 # VS2012+ .vcxproj: Update the toolset version as appropriate
 {vs10\}.vcxproj{vs11\}.vcxproj:
        @echo Copying and updating $< for VS2012
@@ -652,8 +658,7 @@ regenerate-gtk-vsproj-msg:
 regenerate-gdk-vsproj: regenerate-gdk-vsproj-msg $(GTK3_GDK_VCPROJS)
 regenerate-gtk-vsproj: regenerate-gtk-vsproj-msg $(GTK3_GTK_VCPROJS) $(GTK3_GAILUTIL_VCPROJS)
 
-regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) $(GTK3_DEMO_VCPROJS)
-       @echo Regenerating demos.h.win32 and gtk3-demo VS project files...
+regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) 
regenerate-demos-h-win32-msg $(GTK3_DEMO_VCPROJS)
        @-del ..\demos\gtk-demo\demos.h.win32
        @cd ..\demos\gtk-demo
        @$(PYTHON) geninclude.py demos.h.win32 $(demo_sources)