libdbus-1.la: have proper dependencies on Windows
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 27 Aug 2013 12:53:42 +0000 (13:53 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 29 Aug 2013 10:35:52 +0000 (11:35 +0100)
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 <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68505
Acked-by: Ralf Habacker <ralf.habacker@freenet.de>
dbus/Makefile.am

index e118cbb..0f9033d 100644 (file)
@@ -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