Commit 7647208f authored by Chun-wei Fan's avatar Chun-wei Fan

Try again to fix 'make dist'

It turns out that we must put Directory.Build.props in win32/vs10 and let
automake copy it over to win32/vs15/... so do that, and only dist the copy
in win32/vs15.
parent 8f325b47
Pipeline #241224 passed with stages
in 37 minutes and 56 seconds
......@@ -41,10 +41,8 @@ endif
%.props: $(top_builddir)/win32/vs10/Makefile
if test -e $(top_srcdir)/win32/vs10/$@; then \
sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
elif test -e $(top_builddir)/win32/vs10/$@; then \
sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
else \
: \
sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
fi
%.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile
......
include $(top_srcdir)/Makefile.decl
EXTRA_DIST_COPIED = \
EXTRA_DIST += \
Directory.Build.props \
README.txt \
gtk+.sln \
gtk3-prebuild.vcxproj \
......@@ -40,9 +41,7 @@ EXTRA_DIST_COPIED = \
gtk3-install.props \
gtk3-version-paths.props
EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.build.props
DISTCLEANFILES = $(EXTRA_DIST_COPIED)
DISTCLEANFILES = $(EXTRA_DIST)
MSVC_VER = 15
MSVC_VER_LONG = 15
......@@ -51,4 +50,6 @@ MSVC_FORMAT_VER = 12
include $(top_srcdir)/win32/Makefile-newvs.am
Directory.Build.props:
-include $(top_srcdir)/git.mk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment