Commit 77a7a060 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

bin: build vlc-cache-gen even w/ --disable-vlc

This is required if plugins are supported, regardless of whether the
VLC executable is built.
parent 60002d17
......@@ -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 \
......
# 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment