summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2016-10-19 14:48:08 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2016-10-19 14:57:12 +0800
commit841d0d2bcd53d371846abc5329b4d917fcf0c626 (patch)
tree623dc8d526f4beb81ce344719ff77e2d4af5ac75
parente9471764d19f740f756cf7e6d11aba0cbba3d2ae (diff)
downloadpango-841d0d2bcd53d371846abc5329b4d917fcf0c626.tar.gz
build/: Force MSVC project file generation on Makefile.am changes
Make the Makefile.am targets for generating the Visual Studio projects re-generate the project files and the header listings whenever the Makefile.am's that include build/Makefile.msvcproj changes, so that whenever a source/header is added, they will be reflected in the projects and in the property sheets that are used to copy the headers. Also ensure that these are applied to the vs11, vs12 and vs14 projects when this happens, as they are copied and processed from the Visual Studio 2010 projects.
-rw-r--r--build/Makefile-newvs.am2
-rw-r--r--build/Makefile.msvcproj11
2 files changed, 10 insertions, 3 deletions
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index 97b24591..b5e32160 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -30,7 +30,7 @@
sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi
-%.props:
+%.props: $(top_builddir)/build/win32/vs10/Makefile
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 \
diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj
index 9449a5b9..f127eea5 100644
--- a/build/Makefile.msvcproj
+++ b/build/Makefile.msvcproj
@@ -60,10 +60,17 @@ $(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
-$(top_builddir)/build/win32/vs9/$(1).vcproj:
+$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile
-$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj
-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj
-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj
+ -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj
+ -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters
+ -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj
+ -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters
+
for F in $(_proj_files); do \
case $$$$F in \
@@ -87,7 +94,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj:
$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers
-$(top_builddir)/build/win32/vs9/$(1).headers:
+$(top_builddir)/build/win32/vs9/$(1).headers: Makefile
-$(RM) $(top_builddir)/build/win32/vs9/$(1).headers
-$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers