macosx/vout*: fixed a possible segfault on vout close

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 48d6661a8ad7eed2ac54666b4438ab0a262c6fde..7515cbae5a1963d6c270f3920b647997ffcd212b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,13 @@ EXTRA_DIST = \
        MAINTAINERS \
        README.MacOSX.rtf \
        bootstrap \
-       install-win32 \
        src/extras/COPYING \
        toolbox \
        vlc-config.in.in \
        vlc.ebuild \
        vlc.spec \
        vlc.spec.mdk \
+       vlc.win32.nsi \
        $(NULL)
 
 BUILT_SOURCES =
@@ -517,6 +517,7 @@ VLC.app: vlc
        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) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access
        $(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 ; \
@@ -565,25 +566,25 @@ remove_distdir_woody = \
 # XXX: this rule is probably only useful to you if you have exactly
 # the same setup as me. Contact sam@zoy.org if you need to use it.
 #
-# Check that tmp isn't in the way
 package-win32-base:
+# Check that tmp isn't in the way
        @if test -e "$(srcdir)/vlc-${VERSION}"; then \
          echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
          false; \
        else \
          echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
        fi
-# Create installation script
-       cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
+
 # Copy relevant files
+       cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
-       cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
        $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
        @if test -n "$(UPX)"; then \
            $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
-         do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
+         do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
          unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
@@ -626,12 +627,17 @@ package-win32-base:
        done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm"
        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/ ;
+       cp $(srcdir)/share/http/vlm/*.html \
+           $(srcdir)/vlc-${VERSION}/http/vlm/ ;
+
+       cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -645,7 +651,7 @@ endif
 package-win32-base-exe:
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi
+             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-zip:
 # Create package 
@@ -714,7 +720,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 25 "vlc-${VERSION}" $(top_builddir)/tmp/* 
+       $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
 
 # Clean up
        rm -Rf $(top_builddir)/tmp