From dc1d6bb43a4d9e589956738ea4f097867da29b19 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 7 Apr 2015 18:10:32 +0800 Subject: build/Makefile-newvs.am: Use Pattern Rules This allows this common autotools file to be cleaned up quite a bit, and has the benefit of having 'make -jN distcheck' complete successfully. https://bugzilla.gnome.org/show_bug.cgi?id=735039 --- build/Makefile-newvs.am | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index e63b15f7..6345af4f 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -9,29 +9,19 @@ 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 +$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln 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/10<\/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)/ + cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + +%.vcxproj: + cat $(top_builddir)/build/win32/vs10/$@ | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + +%.props: + cat $(top_builddir)/build/win32/vs10/$@ | sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + +%.vcxproj.filters: + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ -- cgit v1.2.1