[vlc-commits] win32: package: Don't copy webplugins manifest

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Mar  8 18:10:12 2017 +0100| [e46772139840bbbef2667b944f22a81ff43d6aa1] | committer: Jean-Baptiste Kempf

win32: package: Don't copy webplugins manifest

And remove a left over libvlc.dll.manifest being packaged

(cherry picked from commit 1e5be3b6b18160a69697b2e61d10b0b3851e58d3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e46772139840bbbef2667b944f22a81ff43d6aa1
---

 extras/package/win32/package.mak | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 61ac032..4fee23c 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -29,7 +29,7 @@ package-win-install:
 package-win-common: package-win-install
 	mkdir -p "$(win32_destdir)"/
 
-# Executables, major libs+manifests
+# Executables, major libs
 	find $(prefix) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \;
 
 # Text files, clean them from mail addresses
@@ -76,9 +76,7 @@ endif
 	find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
 package-win-npapi: build-npapi
-	cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
-	cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 	mkdir -p "$(win32_destdir)/sdk/activex/"
 	cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test/test.html $(win32_destdir)/sdk/activex/
@@ -106,8 +104,6 @@ package-win32-webplugin-common: package-win-strip
 	mkdir -p "$(win32_xpi_destdir)/plugins/"
 	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins/"
 	cp "$(win32_destdir)/libvlc.dll" "$(win32_destdir)/libvlccore.dll" "$(win32_destdir)/npvlc.dll" "$(win32_xpi_destdir)/plugins/"
-	cp $(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins/"
-	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins/"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/gui/"