Win32: Remove rebase stuff

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4c121d750b15c38f9cc71ba8b1550e5105ffacc4..f07508ae3155491ff12660f173d0c995dd2990b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -819,18 +819,13 @@ if BUILD_ACTIVEX
        cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/
 endif
 
-       find $(win32_destdir) -type f -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \;
+       find $(win32_destdir) -type f -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec $(U2D) {} \;
 
 #Enable DEP and ASLR for all the binaries
 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
        find $(win32_destdir) -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' | while read i; \
@@ -853,14 +848,12 @@ package-win32-webplugin-common: package-win-common-strip
 
 package-win32-xpi: package-win32-webplugin-common
        cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
-       cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" \
-                                       install.rdf plugins
+       cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 
 package-win32-crx: package-win32-webplugin-common
        cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"
        crxmake --pack-extension "$(win32_xpi_destdir)" \
-               --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" \
-               --ignore-file install.rdf
+               --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 
 package-win32-base: package-win-common-strip
 
@@ -940,44 +933,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                                                             ##
 #########################################################################