[vlc-devel] [PATCH 2/2] makefiles: use $(LDFLAGS_no_undefined) instead of raw flag

[Filip Roséen]

This allows toggling of the relevant flag as per the recent change to
configure.ac (--{enable,disable}-no-undefined-symbols).
---
 lib/Makefile.am                  | 2 +-
 modules/audio_output/Makefile.am | 2 +-
 modules/common.am                | 2 +-
 modules/hw/vdpau/Makefile.am     | 2 +-
 modules/video_output/Makefile.am | 2 +-
 src/Makefile.am                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 59571d8df5..f0060e17d8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -60,7 +60,7 @@ libvlc_la_LIBADD = \
 	../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
 libvlc_la_LDFLAGS = \
 	$(LDFLAGS_libvlc) \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	-version-info 10:0:5 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index 9006c257cb..718f368c0b 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -42,7 +42,7 @@ libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\"
 libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libvlc_pulse_la_LIBADD = $(PULSE_LIBS) $(LTLIBVLCCORE)
 libvlc_pulse_la_LDFLAGS = \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	-export-symbols-regex ^vlc_pa_ \
 	-version-info 0:0:0
 libpulse_plugin_la_SOURCES = audio_output/pulse.c
diff --git a/modules/common.am b/modules/common.am
index 7d3ce16978..97ff8f22b3 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -30,7 +30,7 @@ AM_LDFLAGS = \
 	-avoid-version -module \
 	-export-symbols-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
 if HAVE_WIN32
 AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo -Wc,-static
diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 0c527cf156..6164b88a1b 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -5,7 +5,7 @@ libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
 libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \
 	$(LIBDL) $(LIBPTHREAD)
 libvlc_vdpau_la_LDFLAGS = \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	-export-symbols-regex ^vdp_ \
 	-version-info 0:0:0
 
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 483a197053..3e9421af82 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -80,7 +80,7 @@ libvlc_xcb_events_la_SOURCES = \
 libvlc_xcb_events_la_CPPFLAGS = -DMODULE_STRING=\"xcb\"
 libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
 libvlc_xcb_events_la_LDFLAGS = \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	-export-symbols-regex ^vlc_xcb_ \
 	-version-info 0:0:0
 libvlc_xcb_events_la_LIBADD = $(XCB_LIBS) $(LTLIBVLCCORE)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e0e70fa86..2691a69dd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -450,7 +450,7 @@ endif
 
 libvlccore_la_LDFLAGS = \
 	$(LDFLAGS_libvlccore) \
-	-no-undefined \
+	$(LDFLAGS_no_undefined) \
 	-export-symbols $(srcdir)/libvlccore.sym \
 	-version-info 8:0:0
 libvlccore_la_DEPENDENCIES = libvlccore.sym
-- 
2.12.0