[atkmm/kjellahl/meson-build-2-28] NMake Makefiles: Support building from Meson-generated tarballs

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

commit 87bc9875ebe5de18287c718ab3f2fd48481373dc
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Apr 17 11:46:26 2020 +0800

    NMake Makefiles: Support building from Meson-generated tarballs
    
    This adds rules to the NMake Makefiles so that they will also look for the sources in
    untracked/.  One still need to use the 'prep-git-build' target to generate the full
    atkmmconfig.h and atkmm.rc source files for such release tarballs, if PERL is present,
    or manually edit those files from their .in templates to their full counterparts.
    
    Also update the check for the generated headers so that we do not attempt to needlessly
    try to run gmmproc by looking for the header in untracked/ as well.

 MSVC_NMake/build-rules-msvc.mak  | 6 ++++++
 MSVC_NMake/create-lists-msvc.mak | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 0d02128..5128d9f 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -18,6 +18,11 @@
 $<
 <<
 
+{..\untracked\atk\atkmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
+       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
+$<
+<<
+
 {..\atk\atkmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
        $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
 $<
@@ -27,6 +32,7 @@ $<
        @if not exist $(@D)\private\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)\private
        @for %%s in ($(<D)\*.ccg) do @if not exist ..\atk\atkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) 
-- $(GMMPROC_DIR)/gmmproc -I ../codegen/m4 --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c $(@D)\$(<B).cc
+       @if exist ..\untracked\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ 
/c ..\untracked\atk\atkmm\$(<B).cc
        @if exist ..\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\atk\atkmm\$(<B).cc
 
 {.\atkmm\}.rc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.res:
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index fee4251..c97a74a 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -63,7 +63,7 @@ atkmm_files_extra_ph_int = $(atkmm_files_extra_ph:/=\)
 !if [call create-lists.bat footer atkmm.mak]
 !endif
 
-!if [for %f in (atkmm\action.h) do @if not exist ..\atk\%f if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\%f (md 
vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private) & ($(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs 
../atk/src action ../atk/src vs$(PDBVER)/$(CFG)/$(PLAT)/atkmm)]
+!if [for %f in (atkmm\action.h) do @if not exist ..\atk\%f if not exist ..\untracked\atk\%f if not exist 
vs$(PDBVER)\$(CFG)\$(PLAT)\%f (md vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private) & ($(PERL) -- 
$(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs ../atk/src action ../atk/src vs$(PDBVER)/$(CFG)/$(PLAT)/atkmm)]
 !endif
 
 !if [for %d in (vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm ..\atk\atkmm ..\untracked\atk\atkmm) do @if exist 
%d\action.h call get-gmmproc-ver %d\action.h>>atkmm.mak]