[glib] build/win32: Make "Install" Property Sheet Generation More Robust

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

commit aef2d0c56dd6d363e51b1c37dc0095054f18098c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Sep 23 16:12:50 2015 +0800

    build/win32: Make "Install" Property Sheet Generation More Robust
    
    List the files that are generated in the process to generate the
    glib-install property sheets, so that we can use that list as a
    depedency, as well as deleting those files in one shot after the
    property sheet is generated, so we don't need to worry about those
    in 'make distclean' or so.

 build/win32/vs10/Makefile.am |    8 ++++----
 build/win32/vs9/Makefile.am  |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 94c1f12..a1b5a5a 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -12,6 +12,8 @@ GENERATED_ITEMS = \
        glib-gen-srcs.props     \
        glib-install.props
 
+MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
+
 EXTRA_DIST = \
        README.txt                      \
        glib.sln                        \
@@ -50,10 +52,8 @@ EXTRA_DIST = \
        glib-gen-srcs.props.in          \
        $(GENERATED_ITEMS)
 
-glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin glib.vs10.headers 
gobject.vs10.headers gio.vs10.headers
+glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
        $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@
-       rm glib.vs10.headers
-       rm gobject.vs10.headers
-       rm gio.vs10.headers
+       rm $(MSVC10_HEADERS_LIST)
 
 DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f2c53da..dd97b7b 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -7,6 +7,8 @@ GENERATED_ITEMS = \
        glib-gen-srcs.vsprops   \
        glib-install.vsprops
 
+MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
+
 EXTRA_DIST = \
        README.txt              \
        glib.sln                \
@@ -31,10 +33,8 @@ EXTRA_DIST = \
        glib-install.vspropsin  \
        $(GENERATED_ITEMS)
 
-glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin glib.headers gobject.headers 
gio.headers
+glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin $(MSVC_HEADERS_LIST)
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@
-       rm glib.headers
-       rm gobject.headers
-       rm gio.headers
+       rm $(MSVC_HEADERS_LIST)
 
 DISTCLEANFILES = $(GENERATED_ITEMS)