Qt: bugfix: playlist's add directory function was failing on input_Read (assert failed)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5c9babbd9aa04aaa9e1ed2846c304c1abce04098..f45388795fc4286092810ea395de950f2d853054 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -392,7 +392,7 @@ endif
 vlc$(EXEEXT): Makefile.am
        rm -f -- vlc vlc.tmp
        echo '#! /bin/sh' > vlc.tmp
-       echo 'exec "$$(dirname "$$0")/bin/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+       echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
        chmod +x vlc.tmp
        mv -f -- vlc.tmp vlc
 
@@ -413,7 +413,7 @@ VLC-release.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       REVISION=`git-describe` && \
+       REVISION=`git describe` && \
        cat $(top_builddir)/extras/package/macosx/Info.plist | \
        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -480,6 +480,10 @@ VLC-release.app: vlc
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \
+       done ; \
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
@@ -575,7 +579,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       REVISION=`git-describe` && \
+       REVISION=`git describe` && \
        cat $(top_builddir)/extras/package/macosx/Info.plist | \
        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -668,6 +672,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 # the same setup as the maintaner(s).
 #
 
+############################################################################
+## Win                                                                    ##
+############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
@@ -773,6 +780,10 @@ endif
 
 if BUILD_LUA
 #Lua Scripts
+       $(INSTALL) -d $(win32_lua_destdir)
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
+       done
        $(INSTALL) -d $(win32_lua_destdir)/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
@@ -837,9 +848,11 @@ if BUILD_SKINS
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \
        done
-       for i in $(srcdir)/share/skins2/*.*; do \
+       for i in $(top_builddir)/share/skins2/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/ || true ; \
-       done
+       done \
+       cp -v share/skins2/default.vlt $(win32_destdir)/skins/ || true ;
+
 endif
 
 if BUILD_OSDMENU
@@ -908,10 +921,19 @@ package-win32-base-zip: package-win32-base
        rm -f -- vlc-$(VERSION)-win32.zip
        zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
 
+package-win32-base-debug-zip: package-win32-base-debug
+# Create package
+       rm -f -- vlc-$(VERSION)-win32-debug.zip
+       zip -r -9 vlc-$(VERSION)-win32-debug.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-base-debug-7zip: package-win32-base-debug
+# Create package
+       7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
+
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
        rm -Rf $(win32_destdir)
@@ -920,16 +942,28 @@ package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug-zip: package-win32-base-debug-zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-win32-7zip: package-win32-base-7zip
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug-7zip: package-win32-base-debug-7zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
 package-win32: package-win32-no-clean
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
@@ -941,6 +975,9 @@ package-wince: package-wince-base  package-wince-base-zip
        rm -Rf $(win32_destdir)
 
 
+#####################################################################
+##   BeOS                                                          ##
+#####################################################################
 package-beos:
 # Check that tmp isn't in the way
        @if test -e $(srcdir)/tmp; then \
@@ -976,7 +1013,10 @@ package-beos:
 # Clean up
        rm -Rf $(srcdir)/tmp
 
-package-macosx: VLC-release.app
+#########################################################################
+## MacOS X                                                             ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
 # Check that the temporary location isn't in the way
        @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
          rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \