From: Simon McVittie Date: Tue, 27 Aug 2013 12:53:42 +0000 (+0100) Subject: libdbus-1.la: have proper dependencies on Windows X-Git-Tag: dbus-1.8.2~182 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ced50f8be12ca91274c64bbf5455138e5f2ae7c3;p=platform%2Fupstream%2Fdbus.git libdbus-1.la: have proper dependencies on Windows Assigning to libdbus_1_la_DEPENDENCIES defeats Automake's normal dependency logic, which makes libdbus-1.la depend on all the static libraries that will go into it (it still had a corrct dependency on the other objects, which go through a separate variable). This meant libdbus-init-win wasn't necessarily built first. Use EXTRA_libdbus_1_la_DEPENDENCIES to avoid that problem. Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68505 Acked-by: Ralf Habacker --- diff --git a/dbus/Makefile.am b/dbus/Makefile.am index e118cbb..0f9033d 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -39,7 +39,7 @@ dbus_res_ldflag = -Wl,$(dbus_res) no_undefined = -no-undefined export_symbols = -libdbus_1_la_DEPENDENCIES = $(dbus_res) +EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res) intllibs = else