* include/vlc_bits.h: bit stream reader/writer.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 923c3eb4e185f828fe8695d18b7f0e6ec142fcd6..e1d04cf96f8adb284ae0e57261e0272f1d02d28f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ NULL =
 #  - 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
+SUBDIRS = intl modules po . mozilla share m4 doc
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
 
 EXTRA_DIST = \
        HACKING \
@@ -90,13 +90,16 @@ HEADERS_include = \
        include/variables.h \
        include/video_output.h \
        include/vlc_block.h \
+       include/vlc_bits.h \
        include/vlc_block_helper.h \
        include/vlc_codec.h \
        include/vlc_common.h \
        include/vlc_config.h \
        include/vlc_cpu.h \
        include/vlc_error.h \
+       include/vlc_help.h \
        include/vlc_interface.h \
+       include/vlc_keys.h \
        include/vlc_messages.h \
        include/vlc_objects.h \
        include/vlc_playlist.h \
@@ -175,17 +178,32 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/vob.icns \
        extras/MacOSX/Resources/wma.icns \
        extras/MacOSX/Resources/wmv.icns \
-       extras/MacOSX/Resources/back.png \
-       extras/MacOSX/Resources/begin.png \
-       extras/MacOSX/Resources/end.png \
-       extras/MacOSX/Resources/forw.png \
-       extras/MacOSX/Resources/list.png \
        extras/MacOSX/Resources/pause.png \
+       extras/MacOSX/Resources/pause_blue.png \
        extras/MacOSX/Resources/play.png \
-       extras/MacOSX/Resources/prefs.png \
-       extras/MacOSX/Resources/slow.png \
+       extras/MacOSX/Resources/play_blue.png \
        extras/MacOSX/Resources/stop.png \
-       extras/MacOSX/Resources/vlc_hg.png \
+       extras/MacOSX/Resources/stop_blue.png \
+       extras/MacOSX/Resources/display.png \
+       extras/MacOSX/Resources/display_slider.png \
+       extras/MacOSX/Resources/display_track.png \
+       extras/MacOSX/Resources/fullscreen_active.png \
+       extras/MacOSX/Resources/fullscreen_blue.png \
+       extras/MacOSX/Resources/next_active.png \
+       extras/MacOSX/Resources/next_blue.png \
+       extras/MacOSX/Resources/playlistdrawer_active.png \
+       extras/MacOSX/Resources/playlistdrawer_blue.png \
+       extras/MacOSX/Resources/previous_active.png \
+       extras/MacOSX/Resources/previous_blue.png \
+       extras/MacOSX/Resources/skip_forward_active.png \
+       extras/MacOSX/Resources/skip_forward_blue.png \
+       extras/MacOSX/Resources/skip_previous_active.png \
+       extras/MacOSX/Resources/skip_previous_blue.png \
+       extras/MacOSX/Resources/volume_high.png \
+       extras/MacOSX/Resources/volume_low.png \
+       extras/MacOSX/Resources/volumeslider_blue.png \
+       extras/MacOSX/Resources/volumeslider_normal.png \
+       extras/MacOSX/Resources/volumetrack.png \
        extras/MacOSX/Resources/about_bg.png \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/README \
@@ -252,8 +270,10 @@ if BUILD_GETOPT
 OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
 if BUILD_MOZILLA
+if !HAVE_WIN32
 LIBRARIES_libvlc_pic = lib/libvlc_pic.a
 endif
+endif
 
 EXTRA_DIST += \
        $(SOURCES_libvlc_beos) \
@@ -292,6 +312,10 @@ SOURCES_libvlc_common = \
        src/interface/interface.c \
        src/interface/intf_eject.c \
        src/playlist/playlist.c \
+       src/playlist/sort.c \
+       src/playlist/loadsave.c \
+       src/playlist/group.c \
+       src/playlist/item.c \
        src/input/input.c \
        src/input/stream.c \
        src/input/demux.c \
@@ -307,7 +331,6 @@ SOURCES_libvlc_common = \
        src/video_output/vout_pictures.c \
        src/video_output/vout_pictures.h \
        src/video_output/video_text.c \
-       src/video_output/video_text.h \
        src/video_output/vout_subpictures.c \
        src/video_output/vout_synchro.c \
        src/audio_output/common.c \
@@ -446,7 +469,7 @@ VLC.app: vlc
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
        cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
              $(top_builddir)/VLC.app
        rm -Rf $(top_builddir)/tmp
@@ -459,6 +482,10 @@ VLC.app: vlc
            then $(INSTALL) "$$i$(LIBEXT)" \
                           "$(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 ; \
+       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 \
@@ -559,11 +586,19 @@ package-win32-base:
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
        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/ ;
 
+       mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
+if BUILD_MOZILLA
+       cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
+       $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+       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 \
@@ -643,7 +678,7 @@ package-macosx:
        cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
 
 # Create disk image 
-       $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/* 
+       $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/* 
 
 # Clean up
        rm -Rf $(top_builddir)/tmp