From: Simon McVittie <smcv@collabora.com>
Date: Thu, 28 Sep 2017 12:18:11 +0000 (+0100)
Subject: dbus: Clarify why we are not just adding the resource file to SOURCES
X-Git-Tag: dbus-1.11.20~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9b86dd3a81b3dd7797d87ba3265087c804a746d;p=thirdparty%2Fdbus.git

dbus: Clarify why we are not just adding the resource file to SOURCES

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
---

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 8248e72ea..064d4152d 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -47,12 +47,17 @@ SUFFIXES = .rc
 .rc.o:
 	$(WINDRES) $< -o $@
 
+# We can't just put versioninfo.rc in SOURCES and let Automake infer
+# how to make versioninfo.o, because libtool wants libtool objects (.lo),
+# not plain COFF objects (.o). Add it to the linker command explicitly
+# instead.
 dbus_res = versioninfo.o
+EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res)
 dbus_res_ldflag = -Wl,$(dbus_res)
+
 no_undefined = -no-undefined
 export_symbols =
 
-EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res)
 intllibs =
 
 else