]> git.sesse.net Git - vlc/blobdiff - Makefile.am
http.c: Fix string.
[vlc] / Makefile.am
index c82630c63da90558cf75e33d1abe9a262797a367..1f1fb930d86f3473a649c7d0c900edfa73f5a767 100644 (file)
@@ -145,6 +145,14 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/volumeslider_normal.png \
        extras/MacOSX/Resources/volumetrack.png \
        extras/MacOSX/Resources/about_bg.png \
+       extras/MacOSX/Resources/skip_forward_active_embedded.png \
+       extras/MacOSX/Resources/play_embedded.png \
+       extras/MacOSX/Resources/pause_embedded.png \
+       extras/MacOSX/Resources/skip_previous_active_embedded.png \
+       extras/MacOSX/Resources/pause_embedded_blue.png \
+       extras/MacOSX/Resources/play_embedded_blue.png \
+       extras/MacOSX/Resources/skip_forward_embedded_blue.png \
+       extras/MacOSX/Resources/skip_previous_embedded_blue.png \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
@@ -412,11 +420,38 @@ VLC-release.app: vlc
            $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ; \
        fi
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http
-       for i in $(srcdir)/share/http/* ; do \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
+       for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
+       for i in $(srcdir)/share/http/dialogs/* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/js/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/admin/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/vlm/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/images/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/requests/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
+       done ; \
+       $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -584,10 +619,8 @@ package-win-common:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-       $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
 if BUILD_SHARED
        cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-       $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
 endif
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
@@ -621,6 +654,8 @@ endif
        cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
        cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
+       cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
 
        cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
@@ -637,7 +672,6 @@ endif
 if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
        cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
        cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
@@ -648,13 +682,24 @@ if BUILD_ACTIVEX
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
        if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
                find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
+package-win-common-strip:
+       $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
+if BUILD_SHARED
+       $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
+endif
+if BUILD_MOZILLA
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+endif
+if BUILD_ACTIVEX
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+
 package-win32-base-debug: package-win-common
 # Copy relevant files
        cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
@@ -687,11 +732,10 @@ package-win32-base-debug: package-win-common
        sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
 
-package-win32-base: package-win32-base-debug
+package-win32-base: package-win32-base-debug package-win-common-strip
        for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-
 package-win32-base-exe: package-win32-base
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
@@ -716,6 +760,10 @@ package-win32-base-zip: package-win32-base
 # Create package 
        zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
 
+package-win32-base-7zip: package-win32-base
+# Create package 
+       7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-${VERSION}-win32.7z vlc-${VERSION}
+
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
@@ -728,11 +776,15 @@ package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-win32-7zip: package-win32-base-7zip
+# Clean up
+       rm -Rf $(top_builddir)/vlc-${VERSION}
+
 package-win32: package-win32-base-exe package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-wince-base: package-win-common
+package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
 # Create package 
@@ -795,7 +847,8 @@ package-macosx:
        echo "Creating disk image" ;
        rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
        hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
-         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ;
+         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet \
+         -scrub -imagekey zlib-level=9 ;
        echo; echo "Disk image creation completed:" ;
        ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;