* stream_Size reports the size of a stream, not stream_Tell

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d4c7ed343154fd3aff33d4672ba7928507afd387..47ebb1219ccbe8c5d60a415eda3c44974427957f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -318,11 +318,11 @@ SOURCES_libvlc_common = \
        src/playlist/group.c \
        src/playlist/item.c \
        src/input/input.c \
+       src/input/es_out.c \
        src/input/stream.c \
        src/input/demux.c \
        src/input/subtitles.c \
-        src/input/input_ext-plugins.c \
-       src/input/input_ext-dec.c \
+       src/input/input_ext-plugins.c \
        src/input/input_ext-intf.c \
        src/input/input_dec.c \
        src/input/input_programs.c \
@@ -484,16 +484,20 @@ VLC.app: vlc
                           "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        if test -d $(top_builddir)/extras/contrib/vlc-lib; then \
-         cp -R $(top_builddir)/extras/contrib/vlc-lib \
-           $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
+         mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
+         for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \
+           $(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 ; \
@@ -554,6 +558,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" ; \
@@ -625,45 +630,38 @@ package-beos:
 # Check that tmp isn't in the way
        @if test -e $(srcdir)/tmp; then \
          echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
-         false; \
+         false ; \
        else \
-         echo "OK."; mkdir $(srcdir)/tmp; \
+         echo "OK." ; mkdir $(srcdir)/tmp ; \
        fi
 
 # Copy relevant files
-       mkdir -p $(srcdir)/tmp/vlc
+       mkdir -p $(srcdir)/tmp/vlc ;
        cd $(srcdir) && \
-         cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+         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" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
+         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
 
-# Create package with debug symbols
-       mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
-       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)/
-
-# Create package without debug symbols
-       mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc
-       strip $(srcdir)/tmp/vlc/vlc
+# Strip files and create package
+       strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
        if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
-         strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \
+         strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
        fi
-       xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
-       mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
-       mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
+       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.zip vlc-${VERSION} )
-       mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
+       mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
 
 # Clean up
-       rm -Rf $(srcdir)/tmp
+       rm -Rf $(srcdir)/tmp ;
 
 package-macosx:
 # Check that tmp isn't in the way