From: Simon McVittie <smcv@collabora.com>
Date: Mon, 23 Oct 2017 12:18:55 +0000 (+0100)
Subject: build: Don't distribute versioninfo.rc in "make dist" tarballs
X-Git-Tag: dbus-1.12.0~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfee8772bf03bd45278dfa32dfe4b472c324f3aa;p=thirdparty%2Fdbus.git

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>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103420
---

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index cbe4539ed..b2913ef0e 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