X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=423cb69442fb152a3d2918a2c365c8ed96f56629;hb=f5b8b43a9e210a70e016871db6bab36929d6b866;hp=0648769c8ec79b78cd17bf511efe9ad5fa591d27;hpb=e52396a4a73c666350a0a4201d7f2ccaf4232956;p=vlc diff --git a/Makefile.am b/Makefile.am index 0648769c8e..423cb69442 100644 --- a/Makefile.am +++ b/Makefile.am @@ -825,13 +825,9 @@ endif if USE_PEFLAGS find $(win32_destdir) -type f -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \; endif -# Rebase all those DLLs to speed up loading (needs cygwin rebase) - if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ - find $(win32_destdir) -type f -name '*$(LIBEXT)' -print | rebase -b 0x70000000 -T -; \ - fi # Strip DLLs -package-win-common-strip: package-win-common +package-win-base: package-win-common find $(win32_destdir) -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' | while read i; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ @@ -841,7 +837,7 @@ package-win-common-strip: package-win-common fi ; \ done -package-win32-webplugin-common: package-win-common-strip +package-win32-webplugin-common: package-win-base mkdir -p "$(win32_xpi_destdir)/plugins" find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" @@ -859,9 +855,7 @@ package-win32-crx: package-win32-webplugin-common crxmake --pack-extension "$(win32_xpi_destdir)" \ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf -package-win32-base: package-win-common-strip - -package-win32-base-exe: package-win32-base +package-win32-base-exe: package-win-base # Script installer cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" @@ -887,28 +881,28 @@ package-win32-base-exe: package-win32-base eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" -package-win32-base-zip: package-win32-base +package-win32-base-zip: package-win-base # Create package rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) -package-win32-base-debug-zip: package-win32-base-debug +package-win32-base-debug-zip: package-win-common # 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 +package-win32-base-7zip: package-win-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 +package-win32-base-debug-7zip: package-win-common # Create package 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION) package-win32-cleanup: rm -Rf $(win32_destdir) $(win32_debugdir) -package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup +package-win32-exe: package-win-base package-win32-base-exe package-win32-cleanup package-win32-zip: package-win32-base-zip package-win32-cleanup @@ -927,7 +921,7 @@ package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip ####### # WinCE ####### -package-wince-base: package-win-common-strip +package-wince-base: package-win-base package-wince-base-zip: package-wince-base # Create package @@ -937,44 +931,6 @@ package-wince-base-zip: package-wince-base package-wince: package-wince-base-zip package-win32-cleanup -##################################################################### -## BeOS ## -##################################################################### -package-beos: -# Check that tmp isn't in the way - @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false ; \ - else \ - echo "OK." ; mkdir $(srcdir)/tmp ; \ - fi - -# Copy relevant files - mkdir -p $(srcdir)/tmp/vlc - cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \ - THANKS NEWS tmp/vlc/ - -# Create debug package - xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc - find $(srcdir)/tmp/vlc -exec mimeset -f {} \; - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) - (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ - mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc - -# Create normal package - $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc - find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \ - --strip-debug --strip-unneeded "{}" \; - xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc - find $(srcdir)/tmp/vlc -exec mimeset -f {} \; - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) - (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ - -# Clean up - rm -Rf $(srcdir)/tmp - ######################################################################### ## MacOS X ## #########################################################################