* mpegvideo.c: try to set a better value for length. (I am not sure it is

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 564dcf76b5a39847e513b06776b7b4c6307f4977..5542a158364a216ae728dc1698e78c6efe6c27ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,11 @@ NULL =
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
-SUBDIRS = intl modules . mozilla share po m4
+#  - intl should come before modules and . because all the code uses gettext
+#  - modules should come before . because vlc needs the builtins
+#  - . 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
 DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
 
 EXTRA_DIST = \
@@ -67,6 +71,7 @@ HEADERS_include = \
        include/darwin_specific.h \
        include/codecs.h \
        include/encoder.h \
+       include/ninput.h \
        include/input_ext-dec.h \
        include/input_ext-intf.h \
        include/input_ext-plugins.h \
@@ -286,6 +291,8 @@ SOURCES_libvlc_common = \
        src/interface/intf_eject.c \
        src/playlist/playlist.c \
        src/input/input.c \
+       src/input/stream.c \
+       src/input/demux.c \
        src/input/input_ext-plugins.c \
        src/input/input_ext-dec.c \
        src/input/input_ext-intf.c \
@@ -404,7 +411,6 @@ VLC.app: vlc
            "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
-       $(INSTALL) -m 644 $(srcdir)/share/*.rle $(srcdir)/VLC.app/Contents/MacOS/share
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http
        $(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http
        $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin
@@ -480,9 +486,6 @@ package-win32:
        for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-       mkdir -p "$(srcdir)/tmp/share"
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
-
        mkdir $(srcdir)/tmp/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
@@ -498,6 +501,11 @@ package-win32:
          cp $$i $(srcdir)/tmp/skins/ || true ; \
        done
 
+       mkdir -p "$(srcdir)/tmp/http/admin"
+       cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ;
+       cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ;
+       cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ;
+
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
 # Clean up
@@ -516,7 +524,7 @@ package-beos:
        mkdir -p $(srcdir)/tmp/vlc
        cd $(srcdir) && \
          cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
-# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+# 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/; \
@@ -525,8 +533,6 @@ package-beos:
          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
-       mkdir -p $(srcdir)/tmp/vlc/share
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
 
 # Create package with debug symbols
        mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
@@ -535,12 +541,14 @@ package-beos:
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
 
 # Create package without debug symbols
-       strip $(srcdir)/tmp/vlc-${VERSION}/vlc
-       if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
-         strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+       mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc
+       strip $(srcdir)/tmp/vlc/vlc
+       if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
+         strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \
        fi
-       xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
-       mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
+       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}
        (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/