[gtk/gtk-3-24] Fix 'make dist' again



commit f8b7bd6dd6133135f535db35090cbd6669496bbb
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Dec 28 22:10:01 2020 +0800

    Fix 'make dist' again
    
    The autotools pattern rules can be off-putting...

 win32/Makefile-newvs.am                    | 2 +-
 win32/{vs10 => vs15}/Directory.Build.props | 0
 win32/vs15/Makefile.am                     | 7 ++++---
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
index e5c7581288..a68e2f99ca 100644
--- a/win32/Makefile-newvs.am
+++ b/win32/Makefile-newvs.am
@@ -41,7 +41,7 @@ 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)/$@; \
-       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)/$@; \
        fi
 
diff --git a/win32/vs10/Directory.Build.props b/win32/vs15/Directory.Build.props
similarity index 100%
rename from win32/vs10/Directory.Build.props
rename to win32/vs15/Directory.Build.props
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
index f2838e8df3..624d56ac48 100644
--- a/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST +=  \
-       Directory.Build.props   \
+EXTRA_DIST_COPIED =    \
        README.txt      \
        gtk+.sln        \
        gtk3-prebuild.vcxproj   \
@@ -41,7 +40,8 @@ EXTRA_DIST += \
        gtk3-install.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_LONG = 15
@@ -51,5 +51,6 @@ MSVC_FORMAT_VER = 12
 include $(top_srcdir)/win32/Makefile-newvs.am
 
 Directory.Build.props:
+       @true
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]