From 77a7a060b5b8a310d014d28583c32f3de32234e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 20 Sep 2017 20:58:16 +0300
Subject: [PATCH] bin: build vlc-cache-gen even w/ --disable-vlc

This is required if plugins are supported, regardless of whether the
VLC executable is built.
---
 Makefile.am     | 8 ++------
 bin/Makefile.am | 8 ++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bd988c75e8..61d822fdea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,8 @@
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
 #  - src (libvlccore) is nedeed by modules
-DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
-SUBDIRS = compat doc po share src modules lib
-if BUILD_VLC
-SUBDIRS += bin
-endif
-SUBDIRS += test
+SUBDIRS = compat doc po share src modules lib bin test
+DIST_SUBDIRS = m4 $(SUBDIRS)
 
 EXTRA_DIST = \
 	extras/package/macosx/package.mak \
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 74e3718324..6953338f24 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,6 @@
 # Building vlc
 #
+if BUILD_VLC
 if HAVE_DARWIN
 bin_PROGRAMS = vlc-osx
 noinst_PROGRAMS = vlc-osx-static
@@ -7,6 +8,7 @@ else
 bin_PROGRAMS = vlc
 noinst_PROGRAMS = vlc-static
 endif
+endif
 EXTRA_DIST = vlc_win32_rc.rc.in
 CLEANFILES = vlc_win32_rc.rc
 
@@ -72,11 +74,13 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
 #
 # Root wrapper
 #
+if BUILD_VLC
 if !HAVE_WIN32
 if !HAVE_OS2
 bin_PROGRAMS += vlc-wrapper
 endif
 endif
+endif
 vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
@@ -90,7 +94,9 @@ vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc $(top_srcdir)/extras/package/win32/vlc.e
 #
 # Plug-ins cache generator
 #
+if HAVE_DYNAMIC_PLUGINS
 vlclib_PROGRAMS = vlc-cache-gen
+endif
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
 	$(GNUGETOPT_LIBS) \
@@ -104,7 +110,9 @@ endif
 #
 # Plug-ins cache
 #
+if HAVE_DYNAMIC_PLUGINS
 noinst_DATA = ../modules/plugins.dat
+endif
 MOSTLYCLEANFILES = $(noinst_DATA)
 
 if HAVE_DARWIN