videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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

This is required if plugins are supported, regardless of whether the
VLC executable is built.
This commit is contained in:
Rémi Denis-Courmont 2017-09-20 20:58:16 +03:00
parent 60002d17b7
commit 77a7a060b5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -6,12 +6,8 @@
# something. DIST_SUBDIRS stores the directories where nothing is built but # something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information. # which have makefiles with distribution information.
# - src (libvlccore) is nedeed by modules # - 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 bin test
SUBDIRS = compat doc po share src modules lib DIST_SUBDIRS = m4 $(SUBDIRS)
if BUILD_VLC
SUBDIRS += bin
endif
SUBDIRS += test
EXTRA_DIST = \ EXTRA_DIST = \
extras/package/macosx/package.mak \ extras/package/macosx/package.mak \

8
bin/Makefile.am
View File

@ -1,5 +1,6 @@
# Building vlc # Building vlc
# #
if BUILD_VLC
if HAVE_DARWIN if HAVE_DARWIN
bin_PROGRAMS = vlc-osx bin_PROGRAMS = vlc-osx
noinst_PROGRAMS = vlc-osx-static noinst_PROGRAMS = vlc-osx-static
@ -7,6 +8,7 @@ else
bin_PROGRAMS = vlc bin_PROGRAMS = vlc
noinst_PROGRAMS = vlc-static noinst_PROGRAMS = vlc-static
endif endif
endif
EXTRA_DIST = vlc_win32_rc.rc.in EXTRA_DIST = vlc_win32_rc.rc.in
CLEANFILES = vlc_win32_rc.rc CLEANFILES = vlc_win32_rc.rc
@ -72,11 +74,13 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
# #
# Root wrapper # Root wrapper
# #
if BUILD_VLC
if !HAVE_WIN32 if !HAVE_WIN32
if !HAVE_OS2 if !HAVE_OS2
bin_PROGRAMS += vlc-wrapper bin_PROGRAMS += vlc-wrapper
endif endif
endif endif
endif
vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_SOURCES = rootwrap.c
vlc_wrapper_LDADD = $(SOCKET_LIBS) 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 # Plug-ins cache generator
# #
if HAVE_DYNAMIC_PLUGINS
vlclib_PROGRAMS = vlc-cache-gen vlclib_PROGRAMS = vlc-cache-gen
endif
vlc_cache_gen_SOURCES = cachegen.c vlc_cache_gen_SOURCES = cachegen.c
vlc_cache_gen_LDADD = \ vlc_cache_gen_LDADD = \
$(GNUGETOPT_LIBS) \ $(GNUGETOPT_LIBS) \
@ -104,7 +110,9 @@ endif
# #
# Plug-ins cache # Plug-ins cache
# #
if HAVE_DYNAMIC_PLUGINS
noinst_DATA = ../modules/plugins.dat noinst_DATA = ../modules/plugins.dat
endif
MOSTLYCLEANFILES = $(noinst_DATA) MOSTLYCLEANFILES = $(noinst_DATA)
if HAVE_DARWIN if HAVE_DARWIN