[pangomm] NMake Makefiles: Fix build from Meson tarballs

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

commit b5b57458eded0b13778360bed787c281cda1ea3a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 12 00:16:54 2020 +0800

    NMake Makefiles: Fix build from Meson tarballs
    
    Look also for headers in untraced/pango and untracked/pango/pangomm, and
    fix up headers installation and build rules.

 MSVC_NMake/build-rules-msvc.mak | 1 +
 MSVC_NMake/config-msvc.mak      | 1 +
 MSVC_NMake/install.mak          | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index c4d488e..02a0166 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -26,6 +26,7 @@ $<
 {..\pango\pangomm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
        $(CXX) $(LIBPANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
 $<
+<<
 
 {..\pango\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj:
        @if not exist $(@D)\private\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)\private
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index fca2f4a..2356cad 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -30,6 +30,7 @@ GMMPROC_DIR=$(PREFIX)\share\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSIO
 
 PANGOMM_BASE_CFLAGS =                  \
        /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
+       /I..\untracked\pango /I..\untracked\pango\pangomm               \
        /I..\pango /I..\pango\pangomm /I.\pangomm               \
        /wd4530 /std:c++17      \
        /FImsvc_recommended_pragmas.h
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index 8605b35..a2acb45 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -13,8 +13,8 @@ install: all
        @for %h in ($(files_built_h) $(files_extra_h)) do @if exist ..\untracked\pango\pangomm\%h copy 
..\untracked\pango\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
        @for %h in ($(files_built_h) $(files_extra_h)) do @if exist ..\pango\pangomm\%h if not exist 
..\untracked\pango\pangomm\%h copy ..\pango\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
        @for %h in ($(files_built_h) $(files_extra_h)) do @if exist vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\%h copy 
vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
-       @for %h in ($(pangomm_generated_private_headers)) do @if exist ..\untracked\pango\pangomm\private\%h 
copy ..\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
-       @for %h in ($(pangomm_generated_private_headers)) do @if exist ..\pango\pangomm\private\%h if not 
exist ..\untracked\pango\pangomm\private\%h copy ..\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
+       @for %h in ($(pangomm_generated_private_headers)) do @if exist ..\untracked\pango\pangomm\private\%h 
copy ..\untracked\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
+       @for %h in ($(pangomm_generated_private_headers)) do @if exist ..\pango\pangomm\private\%h if not 
exist ..\pango\pangomm\private\%h copy ..\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
        @for %h in ($(pangomm_generated_private_headers)) do @if exist 
vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private\%h copy vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
        @copy ".\pangomm\pangommconfig.h" 
"$(PREFIX)\lib\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\include\"
        @copy ..\tools\m4\*.m4 
$(PREFIX)\share\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\proc\m4