MAINTAINERS \
README.MacOSX.rtf \
bootstrap \
- install-win32 \
src/extras/COPYING \
toolbox \
vlc-config.in.in \
vlc.ebuild \
vlc.spec \
vlc.spec.mdk \
+ vlc.win32.nsi \
$(NULL)
BUILT_SOURCES =
include/darwin_specific.h \
include/charset.h \
include/codecs.h \
- include/ninput.h \
- include/input_ext-dec.h \
- include/input_ext-intf.h \
- include/input_ext-plugins.h \
+ include/vlc_es_out.h \
+ include/vlc_input.h \
+ include/vlc_access.h \
+ include/vlc_stream.h \
+ include/vlc_demux.h \
include/intf_eject.h \
include/iso_lang.h \
include/vlc_httpd.h \
include/mtime.h \
include/network.h \
include/os_specific.h \
- include/stream_control.h \
+ include/snapshot.h \
include/stream_output.h \
include/variables.h \
include/video_output.h \
$(NULL)
dist-hook:
- mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
+ cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
###############################################################################
src/playlist/item.c \
src/playlist/item-ext.c \
src/playlist/info.c \
- src/input/input.c \
+ src/input/access.c \
+ src/input/clock.c \
+ src/input/control.c \
+ src/input/decoder.c \
+ src/input/demux.c \
src/input/es_out.c \
+ src/input/input.c \
+ src/input/input_internal.h \
src/input/stream.c \
- src/input/demux.c \
src/input/subtitles.c \
- src/input/input_ext-plugins.c \
- src/input/input_ext-intf.c \
- src/input/input_dec.c \
- src/input/input_programs.c \
- src/input/input_clock.c \
- src/input/input_info.c \
+ src/input/var.c \
src/video_output/video_output.c \
src/video_output/vout_pictures.c \
src/video_output/vout_pictures.h \
src/video_output/video_text.c \
+ src/video_output/video_widgets.c \
src/video_output/vout_subpictures.c \
src/video_output/vout_synchro.c \
+ src/video_output/vout_intf.c \
src/audio_output/common.c \
src/audio_output/dec.c \
src/audio_output/filters.c \
src/audio_output/output.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
+ src/stream_output/announce.c \
+ src/stream_output/sap.c \
src/misc/charset.c \
src/misc/httpd.c \
src/misc/mtime.c \
applescript.m \
controls.h \
controls.m \
- info.h \
- info.m \
intf.h \
intf.m \
macosx.m \
output.m \
playlist.h \
playlist.m \
+ playlistinfo.h \
+ playlistinfo.m \
prefs_widgets.h \
prefs_widgets.m \
prefs.h \
for i in $(srcdir)/share/http/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \
done ; \
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm
+ for i in $(srcdir)/share/http/vlm/* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
+ done ; \
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
for i in $(srcdir)/share/http/admin/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
done ; \
+ $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
# XXX: this rule is probably only useful to you if you have exactly
# the same setup as me. Contact sam@zoy.org if you need to use it.
#
-# Check that tmp isn't in the way
package-win32-base:
+# Check that tmp isn't in the way
@if test -e "$(srcdir)/vlc-${VERSION}"; then \
echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
false; \
else \
echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
fi
-# Create installation script
- cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
+
# Copy relevant files
+ cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
- cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(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 cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
+ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
fi ; done
for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \
+ if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \
+ done
mkdir $(srcdir)/vlc-${VERSION}/locale
for i in $(ALL_LINGUAS); do \
for i in $(srcdir)/share/skins2/default/*.*; do \
cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \
done
+ for i in $(srcdir)/share/skins2/*.*; do \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \
+ done
mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
+ mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm"
cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ;
cp $(srcdir)/share/http/admin/*.html \
$(srcdir)/vlc-${VERSION}/http/admin/ ;
cp $(srcdir)/share/http/admin/.access \
$(srcdir)/vlc-${VERSION}/http/admin/ ;
+ cp $(srcdir)/share/http/vlm/*.html \
+ $(srcdir)/vlc-${VERSION}/http/vlm/ ;
+
+ cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
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}/nsi
+ -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
package-win32-base-zip:
# Create package
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
# Create disk image
- $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/*
+ $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
# Clean up
rm -Rf $(top_builddir)/tmp
projects / vlc / blobdiff