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

Build modules before libvlc and VLC

The largest change here consists of building the plug-ins cache after
vlc-cache-gen (instead of after modules previously).
parent 7dcac684
......@@ -8,11 +8,11 @@
# - src (libvlc) is nedeed by modules
# - libs/* are needed by modules
DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
SUBDIRS = compat doc po share src lib
SUBDIRS = compat doc po share src modules lib
if BUILD_VLC
SUBDIRS += bin
endif
SUBDIRS += modules test
SUBDIRS += test
EXTRA_DIST = \
HACKING \
......
......@@ -2,6 +2,7 @@
#
bin_PROGRAMS = vlc
noinst_PROGRAMS = vlc-static
noinst_DATA =
vlclib_PROGRAMS = vlc-cache-gen
EXTRA_PROGRAMS = vlc-wrapper
EXTRA_DIST = vlc_win32_rc.rc.in
......@@ -22,7 +23,7 @@ endif
EXTRA_vlc_SOURCES = vlc.c winvlc.c
if HAVE_WIN32
vlc_SOURCES = winvlc.c
noinst_DATA = vlc_win32_rc.rc
noinst_DATA += vlc_win32_rc.rc
endif
if HAVE_WINCE
vlc_SOURCES = winvlc.c
......@@ -68,3 +69,27 @@ vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
endif
#
# Plug-ins cache
#
noinst_DATA += ../modules/plugins.dat
MOSTLYCLEANFILES = $(noinst_DATA)
.PHONY: ../modules/plugins.dat
../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
$(AM_V_at)rm -f ../modules/plugins.dat
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
./vlc-cache-gen$(EXEEXT) ../modules ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
install-exec-hook:
if test "$(build)" = "$(host)"; then \
LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
"$(DESTDIR)$(vlclibdir)/plugins" ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
......@@ -63,24 +63,3 @@ SUBDIRS += .
dist_noinst_SCRIPTS = genmf list.sh
dist_noinst_DATA = LIST
noinst_DATA = plugins.dat
MOSTLYCLEANFILES = $(noinst_DATA)
.PHONY: plugins.dat
plugins.dat:
$(AM_V_at)rm -f plugins.dat
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
../bin/vlc-cache-gen$(EXEEXT) . ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
install-exec-hook:
if test "$(build)" = "$(host)"; then \
LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
"$(DESTDIR)$(vlclibdir)/plugins" ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
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