X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6ba5296df51640315b1a40290320633b186a5ae2;hb=8abe30826a4cfa0d25f37d609867027e4f8c9ca5;hp=2a9ffd95609476ed4965892b1f05727339059715;hpb=3f5a2898e863b80e2a4e89936ca98618a2fd2b9a;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 2a9ffd9560..6ba5296df5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,8 +332,8 @@ libcompat:
 libvlc: libcompat
 	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
-core: libvlc
-	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc
+	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
 
 doc:
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
@@ -754,9 +754,8 @@ endif
 	cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
 	cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
 
-package-win32-xpi: package-win-common-strip
+prepare-win32-web-plugin: package-win-common-strip
 	mkdir -p "$(win32_xpi_destdir)/plugins"
-	cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
 	cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
 		"$(win32_xpi_destdir)/plugins"
 	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
@@ -772,7 +771,16 @@ package-win32-xpi: package-win-common-strip
 		"$(win32_xpi_destdir)/plugins/plugins"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
-	cd $(win32_xpi_destdir) && zip -r vlc-$(VERSION).xpi install.rdf plugins
+package-win32-xpi: prepare-win32-web-plugin
+	cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+	cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" \
+					install.rdf plugins
+
+package-win32-crx: prepare-win32-web-plugin
+	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-debug: package-win-common
 # Copy relevant files