# - . should come before mozilla because the plugin needs libvlc_pic.a
# - po should come before . because VLC.app needs the pofiles
SUBDIRS = intl modules po . mozilla share m4 doc
-DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
EXTRA_DIST = \
HACKING \
include/vlc_error.h \
include/vlc_es.h \
include/vlc_es_out.h \
+ include/vlc_filter.h \
include/vlc_help.h \
include/vlc_httpd.h \
+ include/vlc_tls.h \
include/vlc_input.h \
include/vlc_interface.h \
include/vlc_keys.h \
include/vlc_meta.h \
include/vlc_objects.h \
include/vlc_playlist.h \
+ include/vlc_spu.h \
include/vlc_stream.h \
include/vlc_threads_funcs.h \
include/vlc_threads.h \
include/vlc_video.h \
include/vlc_vlm.h \
+ include/vlc_vod.h \
include/vout_synchro.h \
include/win32_specific.h \
$(NULL)
extras/MacOSX/Resources/display.png \
extras/MacOSX/Resources/display_slider.png \
extras/MacOSX/Resources/display_track.png \
+ extras/MacOSX/Resources/equalizerdrawer_active.png \
+ extras/MacOSX/Resources/equalizerdrawer_blue.png \
extras/MacOSX/Resources/fullscreen_active.png \
extras/MacOSX/Resources/fullscreen_blue.png \
extras/MacOSX/Resources/next_active.png \
evc/vlc.vcp.in \
evc/plugins.vcp.in \
evc/vlc.c \
+ evc/errno.h \
evc/config.h.in \
evc/modules_builtin_evc.h \
$(NULL)
src/playlist/playlist.c \
src/playlist/sort.c \
src/playlist/loadsave.c \
- src/playlist/group.c \
+ src/playlist/view.c \
src/playlist/item.c \
src/playlist/item-ext.c \
src/playlist/info.c \
+ src/playlist/services_discovery.c \
src/input/access.c \
src/input/clock.c \
src/input/control.c \
src/stream_output/sap.c \
src/misc/charset.c \
src/misc/httpd.c \
+ src/misc/tls.c \
src/misc/mtime.c \
src/misc/block.c \
src/misc/modules.c \
esac
if HAVE_BEOS
+noinst_DATA = vlc-bundle
vlc-bundle: vlc
- rm -rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle
- cp $(srcdir)/vlc $(srcdir)/vlc-bundle/
- xres -o $(srcdir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
+ rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
+ cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
+ xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
- mkdir -p $(srcdir)/vlc-bundle/plugins ; \
- cp "$$i$(LIBEXT)" $(srcdir)/vlc-bundle/plugins/ ; \
+ mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
+ cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
fi ; \
done
- if test -d $(srcdir)/extras/contrib/vlc-lib ; then \
- mkdir -p $(srcdir)/vlc-bundle/lib ; \
- for i in $(srcdir)/extras/contrib/vlc-lib/*.so ; do \
- cp $$i $(srcdir)/vlc-bundle/lib/ ; \
+ if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
+ mkdir -p $(top_builddir)/vlc-bundle/lib ; \
+ for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
+ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
done ; \
fi
for i in $(ALL_LINGUAS); do \
- mkdir -p "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
- cp "$(srcdir)/po/$$i.gmo" \
- "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
+ mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
+ cp "$(top_builddir)/po/$$i.gmo" \
+ "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
done
- find $(srcdir)/vlc-bundle -type f $(srcdir)/vlc-bundle -exec mimeset -f "{}" \;
+ find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
endif
# Install the modules and the symlinks
applescript.m \
controls.h \
controls.m \
+ equalizer.h \
+ equalizer.m \
intf.h \
intf.m \
macosx.m \
prefs.h \
prefs.m \
vout.h \
+ voutqt.m \
+ voutgl.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
$(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
- @if test -n "$(UPX)"; then \
- $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
fi ; done
for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \
- if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \
- done
+ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
mkdir $(srcdir)/vlc-${VERSION}/locale
for i in $(ALL_LINGUAS); do \
|| true ; \
done
- mkdir -p $(srcdir)/vlc-${VERSION}/skins/default
- for i in $(srcdir)/share/skins/default/*.*; do \
- cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \
- done
- for i in $(srcdir)/doc/skins/*.txt; do \
- cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
- done
- mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts
+ mkdir -p $(srcdir)/vlc-${VERSION}/skins/fonts
for i in $(srcdir)/share/skins2/fonts/*.*; do \
- cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \
- done
- mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default
- for i in $(srcdir)/share/skins2/default/*.*; do \
- cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/fonts/ || true ; \
done
for i in $(srcdir)/share/skins2/*.*; do \
- cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
done
mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
if BUILD_MOZILLA
cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
$(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
- @if test $(UPX); then \
- $(UPX) -9 $(srcdir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); fi ; \
cp $(srcdir)/mozilla/vlcintf.xpt $(srcdir)/vlc-${VERSION}/mozilla/ ;
endif
package-win32-base-exe:
# Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
- -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
+ /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
package-win32-base-zip:
# Create package
# Copy relevant files
mkdir -p $(srcdir)/tmp/vlc ;
- cd $(srcdir) && \
- cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ;
-# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
- if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
- mkdir -p $(srcdir)/tmp/vlc/plugins ; \
- find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \
- fi
- for i in $(ALL_LINGUAS); do \
- mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
- cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
- done
+ cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
+ THANKS NEWS tmp/vlc/ ;
+
+# Create debug package
+ xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
+ find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
+ (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
+ mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
-# Strip files and create package
+# Create normal package
strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
- if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
- strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
- fi
+ find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \
+ --strip-debug --strip-unneeded "{}" \; ;
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
projects / vlc / blobdiff