dbus: Clarify why we are not just adding the resource file to SOURCES
authorSimon McVittie <smcv@collabora.com>
Thu, 28 Sep 2017 12:18:11 +0000 (13:18 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Thu, 28 Sep 2017 14:54:21 +0000 (16:54 +0200)
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>
dbus/Makefile.am

index 8248e72..064d415 100644 (file)
@@ -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