callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'make dist' again

Browse Source 
The autotools pattern rules can be off-putting...
This commit is contained in:
Chun-wei Fan
2020-12-28 22:10:01 +08:00
parent 72b047b084
commit f8b7bd6dd6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win32/Makefile-newvs.am
View File

@ -41,7 +41,7 @@ endif
%.props: $(top_builddir)/win32/vs10/Makefile %.props: $(top_builddir)/win32/vs10/Makefile
if test -e $(top_srcdir)/win32/vs10/$@; then \ 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)/$@; \ sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
else \ 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)/$@; \ sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
fi fi

0
win32/vs10/Directory.Build.props → win32/vs15/Directory.Build.props
View File

7
win32/vs15/Makefile.am
View File

@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \ EXTRA_DIST_COPIED = \
Directory.Build.props \
README.txt \ README.txt \
gtk+.sln \ gtk+.sln \
gtk3-prebuild.vcxproj \ gtk3-prebuild.vcxproj \
@ -41,7 +40,8 @@ EXTRA_DIST += \
gtk3-install.props \ gtk3-install.props \
gtk3-version-paths.props gtk3-version-paths.props
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST_COPIED)
EXTRA_DIST += $(EXTRA_DIST_COPIED) Directory.Build.props
MSVC_VER = 15 MSVC_VER = 15
MSVC_VER_LONG = 15 MSVC_VER_LONG = 15
@ -51,5 +51,6 @@ MSVC_FORMAT_VER = 12
include $(top_srcdir)/win32/Makefile-newvs.am include $(top_srcdir)/win32/Makefile-newvs.am
Directory.Build.props: Directory.Build.props:
@true
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk