[gtk+/gtk-2-24] build: Update Makefile-newvs.am

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

commit d1c13ba58084f965fc8a12835734374963b3f6af
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Dec 15 16:33:40 2015 +0800

    build: Update Makefile-newvs.am
    
    This updates the autotools module copying and generating the MSVC
    2012-2015 projects by copying it from from GLib, which also has the
    advantage of making things work better when doing 'make -jN dist', and
    the Makefile.am's in bui;d/win32/vs[11|12] have been updated accordingly.

 build/Makefile-newvs.am      |   70 +++++++++++++++++++++++------------------
 build/win32/vs11/Makefile.am |    4 +--
 build/win32/vs12/Makefile.am |    8 ++---
 3 files changed, 43 insertions(+), 39 deletions(-)
---
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index e63b15f..97b2459 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -1,37 +1,45 @@
 # Centralized autotools file
-# Create the Visual Studio 2012/2013 project files
+# Create the Visual Studio 2012/2013/2015 project files
 # from the Visual Studio 2010 project files
 
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support, and is copied into
+# $(srcroot)/build/.
+
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
-
-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters create_props
-       cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 
's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$(MSVC_SLN).sln
-
-README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-       cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs$(MSVC_VER)/g' | sed 
's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/README.txt
-
-create_vcxproj:
-       for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.vcxproj)`; do \
-               case $$F in \
-                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v$(MSVC_VER)0/g' > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
-                       ;; \
-               esac; \
-       done
-
-create_props:
-       for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.props)`; do \
-               case $$F in \
-                       *)      cat $(top_builddir)/build/win32/vs10/$$F | sed 
's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
-                       ;; \
-               esac; \
-       done
-
-copy_filters:
-       cp  $(top_srcdir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs$(MSVC_VER)/
-
-
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+       sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+       sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+
+%.txt:
+       sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+       sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+
+%.vcxproj:
+       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+               sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       else \
+               sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       fi
+
+%.props:
+       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ 
> $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       else \
+               sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < 
$(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       fi
+
+%.vcxproj.filters:
+       if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+               cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       else \
+               cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+       fi
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 9f4d389..12d6cd8 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -23,10 +23,8 @@ EXTRA_DIST +=        \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gtk+
-
 MSVC_VER = 11
-
 MSVC_VER_LONG = 2012
+MSVC_FORMAT_VER = 12
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 0de2679..12d6cd8 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -23,10 +23,8 @@ EXTRA_DIST +=        \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gtk+
-
-MSVC_VER = 12
-
-MSVC_VER_LONG = 2013
+MSVC_VER = 11
+MSVC_VER_LONG = 2012
+MSVC_FORMAT_VER = 12
 
 include $(top_srcdir)/build/Makefile-newvs.am