[gtkmm/gtkmm-3-24] NMake Makefiles: Fix headers 'install'

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

commit 5d92d6f8cc050ba8514d39e6f6a5eeae12ab8414
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 10 15:30:07 2020 +0800

    NMake Makefiles: Fix headers 'install'
    
    The previous update accidentily removed the parts where we copy the
    deprecated header files, so we want to restore that.
    
    We also want to streamline whether we copy the deprecated hand-written
    headers by whether we include deprecated items in the build.

 MSVC_NMake/config-msvc.mak | 10 +++++-----
 MSVC_NMake/install.mak     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 652fe5b2..601e4a7d 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -214,12 +214,9 @@ TARGETS = $(TARGETS) $(GTKMM3_DEMO)
 
 GENDEF = vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe
 
-GDKMM_INT_GENERATED_HEADERS = $(gdkmm_files_any_hg:.hg=.h)
-GDKMM_INT_GENERATED_HEADERS_P = $(gdkmm_files_any_hg:.hg=_p.h)
-GTKMM_INT_GENERATED_HEADERS = $(gtkmm_files_any_hg:.hg=.h)
-GTKMM_INT_GENERATED_HEADERS_P = $(gtkmm_files_any_hg:.hg=_p.h)
 GTKMM_INT_EXTRA_SOURCES = $(gtkmm_files_extra_any_cc)
 GTKMM_INT_EXTRA_HEADERS_P = $(gtkmm_files_extra_ph:/=\)
+GTKMM_INT_EXTRA_HEADERS = $(gtkmm_files_extra_any_h)
 
 GDKMM_HG_FILES = $(gdkmm_files_any_hg)
 GTKMM_HG_FILES = $(gtkmm_files_any_hg)
@@ -228,12 +225,15 @@ ENABLED_DEPRECATED = no
 
 !ifndef DISABLE_DEPRECATED
 GTKMM_INT_EXTRA_SOURCES = $(GTKMM_INT_EXTRA_SOURCES) $(gtkmm_files_extra_deprecated_cc)
-
+GTKMM_INT_EXTRA_HEADERS = $(GTKMM_INT_EXTRA_HEADERS) $(gtkmm_files_extra_deprecated_h)
 GDKMM_HG_FILES = $(GDKMM_HG_FILES) $(gdkmm_files_deprecated_hg)
 GTKMM_HG_FILES = $(GTKMM_HG_FILES) $(gtkmm_files_deprecated_hg)
 ENABLED_DEPRECATED = yes
 !endif
 
+GDKMM_INT_GENERATED_HEADERS = $(GDKMM_HG_FILES:.hg=.h)
+GDKMM_INT_GENERATED_HEADERS_P = $(GDKMM_HG_FILES:.hg=_p.h)
+GTKMM_INT_GENERATED_HEADERS = $(GTKMM_HG_FILES:.hg=.h)
 GDKMM_INT_GENERATED_SOURCES = $(GDKMM_HG_FILES:.hg=.cc) wrap_init.cc
 GTKMM_INT_GENERATED_SOURCES = $(GTKMM_HG_FILES:.hg=.cc) wrap_init.cc
 
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index a41c9a93..a227a33c 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -23,10 +23,10 @@ install: all
        @for %h in ($(GDKMM_INT_GENERATED_HEADERS_P)) do @if exist 
vs$(PDBVER)\$(CFG)\$(PLAT)\gdkmm\private\%h copy vs$(PDBVER)\$(CFG)\$(PLAT)\gdkmm\private\%h 
"$(PREFIX)\include\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\%h"
        @copy ".\gdkmm\gdkmmconfig.h" 
"$(PREFIX)\lib\gdkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\"
        @copy ..\gtk\gtkmm.h "$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\"
-       @for %h in ($(gtkmm_files_extra_any_h) $(gtkmm_files_extra_deprecated_h)) do @copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
+       @for %h in ($(GTKMM_INT_EXTRA_HEADERS)) do @copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
        @for %h in ($(GTKMM_INT_GENERATED_HEADERS)) do @if exist ..\gtk\gtkmm\%h copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
        @for %h in ($(GTKMM_INT_GENERATED_HEADERS)) do @if exist vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\%h copy 
vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
        @for %h in ($(GTKMM_INT_EXTRA_HEADERS_P)) do @copy ..\gtk\gtkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\%h"
-       @for %h in ($(GTKMM_INT_GENERATED_HEADERS_P)) do @if exist ..\gtk\gtkmm\private\%h copy 
..\gtk\gtkmm\private\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\%h"
-       @for %h in ($(GTKMM_INT_GENERATED_HEADERS_P)) do @if exist 
vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\private\%h copy vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\private\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\%h"
+       @for %h in ($(GTKMM_HG_FILES)) do @if exist ..\gtk\gtkmm\private\%~nh_p.h copy 
..\gtk\gtkmm\private\%~nh_p.h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\%~nh_p.h"
+       @for %h in ($(GTKMM_HG_FILES)) do @if exist vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\private\%~nh_p.h copy 
vs$(PDBVER)\$(CFG)\$(PLAT)\gtkmm\private\%~nh_p.h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\%~nh_p.h"
        @copy ".\gtkmm\gtkmmconfig.h" 
"$(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\"