X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=423cb69442fb152a3d2918a2c365c8ed96f56629;hb=ac49700607b46e824d93671722c8442aad409a6a;hp=94485d5a8da751daeff5a30218d7a8dfc7f8a36b;hpb=e1e5b556c7907f6372263c0869381b30fdbb43a7;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 94485d5a8d..423cb69442 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -719,9 +719,8 @@ package-win-common: install
 	fi
 
 # Executables, major libs+manifests
-	for file in $(destdir)/bin/vlc$(EXEEXT) $(destdir)/bin/libvlc$(LIBEXT) \
-                $(destdir)/bin/libvlccore$(LIBEXT) $(destdir)/lib/vlc/vlc-cache-gen$(EXEEXT) \
-                $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \
+	find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" -exec cp {} "$(win32_destdir)/" \;
+	for file in $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \
                 $(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \
 	    do cp $$file "$(win32_destdir)/" ; done;
 
@@ -803,40 +802,32 @@ if BUILD_OSDMENU
 	done
 endif
 if BUILD_MOZILLA
-	mkdir -p "$(win32_destdir)/mozilla"
-	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
 endif
 if BUILD_ACTIVEX
-	mkdir -p "$(win32_destdir)/activex"
-	cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
-	cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
-	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
 endif
 
 # SDK
-	mkdir -p "$(win32_destdir)/sdk"
-	mkdir -p "$(win32_destdir)/sdk/lib" 
+	mkdir -p "$(win32_destdir)/sdk/lib"
 	cp -r $(destdir)/include "$(win32_destdir)/sdk"
 	cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
 	for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
         cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+if BUILD_ACTIVEX
+	cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/
+	cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/
+endif
 
-	find $(win32_destdir) -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 '*dll' -print -o -name '*exe' -print -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
+	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 '*.dll' -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"; \
@@ -846,38 +837,25 @@ 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"
-	cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
-		"$(win32_xpi_destdir)/plugins"
-	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
-		"$(win32_xpi_destdir)/plugins"
-	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" \
-		"$(win32_xpi_destdir)/plugins"
-	cp "$(win32_destdir)/libvlccore$(LIBEXT)" \
-		"$(win32_xpi_destdir)/plugins"
-	cp "$(win32_destdir)/libvlc$(LIBEXT)" \
-		"$(win32_xpi_destdir)/plugins"
-	mkdir -p "$(win32_xpi_destdir)/plugins/plugins"
-	cp $(win32_destdir)/plugins/*$(LIBEXT) \
-		"$(win32_xpi_destdir)/plugins/plugins"
+	find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
+	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
 
 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
-
-package-win32-base: package-win-common-strip
+		--extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 
-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)/"
@@ -903,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
 
@@ -943,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 
@@ -953,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                                                             ##
 #########################################################################