* playlist.c: better random algorithm: do not play an item if it has

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8c7a55d09754697ace23faade91d5c52efe411b9..99addfe7e9da39bee98ff76fce405086ee5a3354 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
+       vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
        bootstrap \
@@ -77,7 +78,7 @@ HEADERS_include = \
        include/input_ext-plugins.h \
        include/intf_eject.h \
        include/iso_lang.h \
-       include/httpd.h \
+       include/vlc_httpd.h \
        include/main.h \
        include/mmx.h \
        include/modules.h \
@@ -102,6 +103,8 @@ HEADERS_include = \
        include/vlc_interface.h \
        include/vlc_keys.h \
        include/vlc_messages.h \
+       include/vlc_meta.h \
+       include/vlc_vlm.h \
        include/vlc_objects.h \
        include/vlc_playlist.h \
        include/vlc_threads.h \
@@ -317,7 +320,10 @@ SOURCES_libvlc_common = \
        src/playlist/loadsave.c \
        src/playlist/group.c \
        src/playlist/item.c \
+       src/playlist/item-ext.c \
+       src/playlist/info.c \
        src/input/input.c \
+       src/input/control.c \
        src/input/es_out.c \
        src/input/stream.c \
        src/input/demux.c \
@@ -327,13 +333,13 @@ SOURCES_libvlc_common = \
        src/input/input_dec.c \
        src/input/input_programs.c \
        src/input/input_clock.c \
-       src/input/input_info.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/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 \
@@ -343,6 +349,7 @@ SOURCES_libvlc_common = \
        src/audio_output/intf.c \
        src/stream_output/stream_output.c \
        src/misc/charset.c \
+       src/misc/httpd.c \
        src/misc/mtime.c \
        src/misc/block.c \
        src/misc/modules.c \
@@ -355,6 +362,8 @@ SOURCES_libvlc_common = \
        src/misc/objects.c \
        src/misc/variables.c \
        src/misc/error.c \
+       src/misc/net.c \
+       src/misc/vlm.c \
        src/extras/libc.c \
        $(NULL)
 
@@ -463,6 +472,8 @@ VLC.app: vlc
            output.m \
            playlist.h \
            playlist.m \
+           prefs_widgets.h \
+           prefs_widgets.m \
            prefs.h \
            prefs.m \
            vout.h \
@@ -486,16 +497,18 @@ VLC.app: vlc
        if test -d $(top_builddir)/extras/contrib/vlc-lib; then \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
          for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \
-           install -c $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \
+           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \
          done ; \
        fi
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http
-       $(INSTALL) -m 644 $(srcdir)/share/http/*.html \
-           $(top_builddir)/VLC.app/Contents/MacOS/share/http
+       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/admin
-       $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \
-           $(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) -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 ; \
@@ -556,6 +569,7 @@ package-win32-base:
        cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
        $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
@@ -586,6 +600,14 @@ package-win32-base:
        for i in $(srcdir)/doc/skins/*.txt; do \
          cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
        done
+       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/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 ; \
+       done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
        cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
@@ -679,6 +701,34 @@ package-macosx:
 # Clean up
        rm -Rf $(top_builddir)/tmp
 
+package-translations:
+       @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
+         echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \
+         false; \
+       else \
+         echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
+       fi
+# Copy translations
+       for i in $(ALL_LINGUAS); do \
+         cp "$(srcdir)/po/$${i}.po" \
+           "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
+           || true ; \
+       done
+       cp "$(srcdir)/doc/translations.txt" \
+         "$(srcdir)/vlc-translations-${VERSION}/README.txt"
+
+       echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo 'if test $$# != 1; then' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "  echo \"Usage: convert-po.sh <.po file>\"" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "  exit 1" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "fi" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo 'msgfmt --statistics -o vlc.mo $$1' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+
+       $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
+         | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
+
 ###############################################################################
 # Stamp rules
 ###############################################################################