Windows: Use libtool-detected RC to compile resources in tools/

We have two variables that both expand to i686-w64-mingw32-windres,
namely WINDRES and RC, and we might as well use the same one as
in dbus/ here. However, it seems we can't wrap windres in libtool
when producing an executable: if we use .rc.lo, my Automake 1.15.1
doesn't realise that it needs to include disable-uac.lo in the
list of objects, whereas if we use .rc.o, Ralf's libtool 2.4.2 and
Automake 1.13.4 disagree on where the output should go
(.libs/disable-uac.o vs. disable-uac.o) and the link fails.

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 96ce03f..2509201 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -118,7 +118,7 @@ if DBUS_WIN
 SUFFIXES = .rc
 
 .rc.o:
-       $(WINDRES) $< -o $@
+       $(RC) $< -o $@
 
 nodist_dbus_update_activation_environment_SOURCES = disable-uac.rc