X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c00082a9a59b5bd43b0594cc82ebe43743a813a8;hb=7c091cbe7a4fcc36218df65f5aa46f92e1a9a37f;hp=c42b593cbc73c42c330f64ed301d7014407e5892;hpb=8bb0f4db7dddcfe909c3497edc28a0246e1b4b45;p=vlc

diff --git a/Makefile.am b/Makefile.am
index c42b593cbc..c00082a9a5 100644
--- 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/
@@ -453,7 +453,6 @@ VLC-release.app: vlc
 	    simple_prefs.h \
 	    simple_prefs.m \
 	    vout.h \
-	    voutqt.m \
 	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
@@ -480,6 +479,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}` ; \
@@ -562,6 +565,8 @@ VLC-release.app: vlc
 	      $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
 	done
 	printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
+	find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete;
+	find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete;
 	find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
 	find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
@@ -575,7 +580,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/
@@ -615,7 +620,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	    simple_prefs.h \
 	    simple_prefs.m \
 	    vout.h \
-	    voutqt.m \
 	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
@@ -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
@@ -745,6 +752,9 @@ package-win32-base-debug: package-win-common
 	    $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
 	  fi ; done
 
+# Contrib *.dll's
+	cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
 	mkdir -p "$(win32_lua_destdir)/http/images"
@@ -773,6 +783,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,7 +851,7 @@ 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
 endif
@@ -872,9 +886,8 @@ endif
 
 #strip exe and main dll
 package-win-common-strip: package-win32-base-debug
-	$(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+	for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
+	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
 if BUILD_MOZILLA
 	$(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif
@@ -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,6 +1013,9 @@ package-beos:
 # Clean up
 	rm -Rf $(srcdir)/tmp
 
+#########################################################################
+## 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 \