Contribs: Update FFMPEG to HEAD because there were many fixes in H264 decoding lately.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 008954337743673157e1e63f706c9f50672cb888..977e86e66ee98c410b288821e5897f55514252d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,10 @@ EXTRA_DIST = \
        extras/package/rpm/vlc.fedora.spec \
        extras/package/rpm/vlc.mandriva.spec \
        extras/package/rpm/vlc.altlinux.spec \
-       extras/package/win32/vlc.win32.nsi.in
+       extras/package/win32/vlc.win32.nsi.in \
+       extras/package/win32/languages/declaration.nsh \
+       extras/package/win32/languages/english.nsh \
+       extras/package/win32/languages/french.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
@@ -59,6 +62,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-dbus \
        --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+       --disable-live555 \
        --disable-fribidi --disable-glx
 
 ACLOCAL_AMFLAGS = -I m4
@@ -80,8 +84,6 @@ ChangeLog: Makefile.am
 ###############################################################################
 
 EXTRA_DIST += \
-       extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
-       extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
@@ -726,6 +728,8 @@ package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
        cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+       mkdir "$(win32_destdir)/languages"
+       cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
 
 # Plugins
        mkdir -p "$(win32_destdir)/plugins"
@@ -965,7 +969,7 @@ package-beos:
 # Clean up
        rm -Rf $(srcdir)/tmp
 
-package-macosx:
+package-macosx: VLC-release.app
 # Check that the temporary location isn't in the way
        @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
          rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
@@ -1033,7 +1037,7 @@ package-macosx:
 # Clean up
        rm -Rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-zip:
+package-macosx-zip: VLC-release.app
        rm -Rf $(top_builddir)/vlc-$(VERSION)
        mkdir -p $(top_builddir)/vlc-$(VERSION)
        cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
@@ -1044,7 +1048,7 @@ package-macosx-zip:
        cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
             $(top_builddir)/vlc-$(VERSION)/Goodies
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
-          $(top_builddir)/vlc-$(VERSION)
+          $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
        zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
        rm -Rf $(top_builddir)/vlc-$(VERSION)