From 0206729d61b325c3103e6711429eeb5de6201c7c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 23 Oct 2017 13:18:55 +0100 Subject: [PATCH 1/4] build: Don't distribute versioninfo.rc in "make dist" tarballs It's generated by configure, so we should not distribute it, and we should clean it up in "make distclean". Signed-off-by: Simon McVittie --- dbus/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dbus/Makefile.am b/dbus/Makefile.am index cbe4539e..6e459d94 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 @@ -327,3 +333,5 @@ test_dbus_LDADD = libdbus-internal.la clean-local: $(AM_V_at)rm -fr ./.dbus-keyrings + +DISTCLEANFILES = versioninfo.rc -- 2.15.0.rc1