From 84dab2a431b88f863caeb6b5b72acbd6f349fbe1 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux Date: Sat, 12 Aug 2023 18:06:16 +0200 Subject: [PATCH] bin: Makefile.am: use EXTRA_%_DEPENDENCIES Setting the target DEPENDENCIES might lead to confusing behaviour where dependencies added to LDADD are not propagated correctly. The automake manual suggest using `EXTRA_%_DEPENDENCIES` when the goal is to augment the automake-generated `%_DEPENDENCIES` instead. --- bin/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 1186d98ccf..bc1b9b3fa2 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -30,7 +30,7 @@ vlc_SOURCES = vlc.c override.c vlc_LDADD += $(LIBDL) else vlc_SOURCES = winvlc.c -vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) +EXTRA_vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) vlc_LDFLAGS = -mwindows -Wc,-static vlc_LDADD += vlc_win32_rc.$(OBJEXT) libbreakpad_wrapper_la_SOURCES = breakpad.cpp @@ -40,7 +40,7 @@ libbreakpad_wrapper_la_CXXFLAGS = $(AM_CXXFLAGS) $(BREAKPAD_CFLAGS) -DBREAKPAD_U if HAVE_BREAKPAD noinst_LTLIBRARIES = libbreakpad_wrapper.la vlc_LDADD += libbreakpad_wrapper.la -lstdc++ -lwininet -vlc_DEPENDENCIES += libbreakpad_wrapper.la +EXTRA_vlc_DEPENDENCIES += libbreakpad_wrapper.la vlc_CPPFLAGS += -DHAVE_BREAKPAD endif endif @@ -81,7 +81,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ $(NULL) vlc_static_CPPFLAGS = $(vlc_CPPFLAGS) -vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES) +EXTRA_vlc_static_DEPENDENCIES = $(EXTRA_vlc_DEPENDENCIES) vlc_static_LDADD = $(vlc_LDADD) vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static @@ -119,7 +119,7 @@ vlc_cache_gen_LDADD = \ if HAVE_WIN32 vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT) vlc_cache_gen_LDFLAGS = -Wc,-static -vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) +EXTRA_vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) endif #