Attachment 135011 Details for Bug 103420 – build: Don't distribute versioninfo.rc in "make dist" tarballs

[patch] build: Don't distribute versioninfo.rc in "make dist" tarballs

0001-build-Don-t-distribute-versioninfo.rc-in-make-dist-t.patch (text/plain), 1.13 KB, created by Simon McVittie on 2017-10-23 13:42:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-10-23 13:42:53 UTC

Size: 1.13 KB

patch

obsolete

>From fa54f4ebc733fef4900e1cb70462f48931c4b514 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 23 Oct 2017 13:18:55 +0100
>Subject: [PATCH 1/5] build: Don't distribute versioninfo.rc in "make dist"
> tarballs
>
>It's generated by configure, so we should not distribute it.
>Because it's generated by configure, it is automatically cleaned up
>by "make distclean" via $(CONFIG_CLEAN_FILES).
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/Makefile.am | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/dbus/Makefile.am b/dbus/Makefile.am
>index cbe4539e..b2913ef0 100644
>--- a/dbus/Makefile.am
>+++ b/dbus/Makefile.am
>@@ -37,6 +37,9 @@ dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
> 
> lib_LTLIBRARIES=libdbus-1.la
> 
>+# Initialize to empty so that we can append later
>+nodist_libdbus_1_la_SOURCES =
>+
> #
> # Deal with W32 .def and version-info.rc stuff
> #
>@@ -57,7 +60,10 @@ if DBUS_WIN
> DBUS_LIB_arch_sources = 			\
> 	dbus-server-win.c 			\
> 	dbus-server-win.h			\
>-	versioninfo.rc				\
>+	$(NULL)
>+
>+nodist_libdbus_1_la_SOURCES += \
>+	versioninfo.rc \
> 	$(NULL)
> 
> if DBUS_WINCE
>-- 
>2.15.0.rc1
>

Actions: View | Splinter Review

Attachments on bug 103420: 135006 | 135007 | 135008 | 135009 | 135011 | 135012 | 135013

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.