X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=0c4a146fafb96f94fea6163602896a116537b909;hb=6f9bf4ab7f99b89c6c2d6c977028b34f71095a18;hp=a6884a6423440dccb6fa99081d51d230e1f5102d;hpb=e7da2d0afe9c3b3ff18292ddc6c51179a579c46a;p=vlc

diff --git a/Makefile.am b/Makefile.am
index a6884a6423..0c4a146faf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,8 +51,29 @@ EXTRA_DIST = \
 	extras/package/win32/UAC.nsh \
 	extras/package/win32/UAC.dll \
 	extras/package/win32/languages/declaration.nsh \
+	extras/package/win32/languages/bengali.nsh \
+	extras/package/win32/languages/brazilian_portuguese.nsh \
+	extras/package/win32/languages/bulgarian.nsh \
+	extras/package/win32/languages/catalan.nsh \
+	extras/package/win32/languages/danish.nsh \
+	extras/package/win32/languages/dutch.nsh \
 	extras/package/win32/languages/english.nsh \
-	extras/package/win32/languages/french.nsh
+	extras/package/win32/languages/estonian.nsh \
+	extras/package/win32/languages/finnish.nsh \
+	extras/package/win32/languages/french.nsh \
+	extras/package/win32/languages/german.nsh \
+	extras/package/win32/languages/hungarian.nsh \
+	extras/package/win32/languages/italian.nsh \
+	extras/package/win32/languages/japanese.nsh \
+	extras/package/win32/languages/occitan.nsh \
+	extras/package/win32/languages/polish.nsh \
+	extras/package/win32/languages/punjabi.nsh \
+	extras/package/win32/languages/romanian.nsh \
+	extras/package/win32/languages/schinese.nsh \
+	extras/package/win32/languages/slovak.nsh \
+	extras/package/win32/languages/slovenian.nsh \
+	extras/package/win32/languages/sorani.nsh \
+	extras/package/win32/languages/spanish.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 nodist_noinst_SCRIPTS = compile
@@ -77,7 +98,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-mad --disable-libmpeg2 \
 	--disable-faad --disable-skins2 \
 	--disable-live555 \
-	--disable-fribidi --disable-glx
+	--disable-fribidi --disable-glx \
+	--with-kde-solid='$${datadir}/kde4/apps'
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -332,8 +354,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
@@ -712,10 +734,10 @@ package-win-common:
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
 	  do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done
-	unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
+	$(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-	cp $(srcdir)/share/vlc.ico $(win32_destdir)/
+	cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
 
 # Copy the locales
 	mkdir -p $(win32_destdir)/locale
@@ -739,7 +761,7 @@ 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/
-	unix2dos $(win32_destdir)/activex/*
+	$(U2D) $(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/
 endif
@@ -754,9 +776,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 +793,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
@@ -803,25 +833,25 @@ if BUILD_LUA
 	mkdir -p "$(win32_lua_destdir)/http/js"
 	mkdir -p "$(win32_lua_destdir)/http/dialogs"
 	cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/
-	unix2dos $(win32_lua_destdir)/http/*.html
+	$(U2D) $(win32_lua_destdir)/http/*.html
 	cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/
-	unix2dos $(win32_lua_destdir)/http/.hosts
+	$(U2D) $(win32_lua_destdir)/http/.hosts
 	cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/
-	unix2dos $(win32_lua_destdir)/http/*.css
+	$(U2D) $(win32_lua_destdir)/http/*.css
 	cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
-	unix2dos $(win32_lua_destdir)/http/js/*.js
+	$(U2D) $(win32_lua_destdir)/http/js/*.js
 	cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
-	unix2dos $(win32_lua_destdir)/http/*.lua
+	$(U2D) $(win32_lua_destdir)/http/*.lua
 	cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
-	unix2dos $(win32_lua_destdir)/http/dialogs/*
+	$(U2D) $(win32_lua_destdir)/http/dialogs/*
 	cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
-	unix2dos $(win32_lua_destdir)/http/dialogs/.hosts
+	$(U2D) $(win32_lua_destdir)/http/dialogs/.hosts
 	cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/
 	cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/
 	cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/
-	unix2dos $(win32_lua_destdir)/http/requests/*.xml
+	$(U2D) $(win32_lua_destdir)/http/requests/*.xml
 	cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt
-	unix2dos $(win32_lua_destdir)/http/requests/readme.txt
+	$(U2D) $(win32_lua_destdir)/http/requests/readme.txt
 
 #Lua Scripts
 	$(INSTALL) -d $(win32_lua_destdir)
@@ -865,14 +895,14 @@ if BUILD_LUA
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
 	done
 
-	unix2dos $(win32_lua_destdir)/README.txt
-	unix2dos $(win32_lua_destdir)/extensions/README.txt
-	unix2dos $(win32_lua_destdir)/intf/README.txt
-	unix2dos $(win32_lua_destdir)/meta/art/README.txt
-	unix2dos $(win32_lua_destdir)/meta/fetcher/README.txt
-	unix2dos $(win32_lua_destdir)/meta/reader/README.txt
-	unix2dos $(win32_lua_destdir)/playlist/README.txt
-	unix2dos $(win32_lua_destdir)/sd/README.txt
+	$(U2D) $(win32_lua_destdir)/README.txt
+	$(U2D) $(win32_lua_destdir)/extensions/README.txt
+	$(U2D) $(win32_lua_destdir)/intf/README.txt
+	$(U2D) $(win32_lua_destdir)/meta/art/README.txt
+	$(U2D) $(win32_lua_destdir)/meta/fetcher/README.txt
+	$(U2D) $(win32_lua_destdir)/meta/reader/README.txt
+	$(U2D) $(win32_lua_destdir)/playlist/README.txt
+	$(U2D) $(win32_lua_destdir)/sd/README.txt
 endif
 
 # Copy the http files
@@ -882,23 +912,23 @@ if BUILD_HTTPD
 	mkdir -p "$(win32_http_destdir)/js"
 	mkdir -p "$(win32_http_destdir)/dialogs"
 	cp $(srcdir)/share/http/*.html $(win32_http_destdir)/
-	unix2dos $(win32_http_destdir)/*.html
+	$(U2D) $(win32_http_destdir)/*.html
 	cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/
-	unix2dos $(win32_http_destdir)/.hosts
+	$(U2D) $(win32_http_destdir)/.hosts
 	cp $(srcdir)/share/http/*.css $(win32_http_destdir)/
-	unix2dos $(win32_http_destdir)/*.css
+	$(U2D) $(win32_http_destdir)/*.css
 	cp $(srcdir)/share/http/js/*.js $(win32_http_destdir)/js/
-	unix2dos $(win32_http_destdir)/js/*.js
+	$(U2D) $(win32_http_destdir)/js/*.js
 	cp $(srcdir)/share/http/dialogs/* $(win32_http_destdir)/dialogs/
-	unix2dos $(win32_http_destdir)/dialogs/*
+	$(U2D) $(win32_http_destdir)/dialogs/*
 	cp $(srcdir)/share/http/dialogs/.hosts $(win32_http_destdir)/dialogs/
-	unix2dos $(win32_http_destdir)/dialogs/.hosts
+	$(U2D) $(win32_http_destdir)/dialogs/.hosts
 	cp $(srcdir)/share/http/*.ico $(win32_http_destdir)/
 	cp $(srcdir)/share/http/images/*.png $(win32_http_destdir)/images/
 	cp $(srcdir)/share/http/requests/*.xml $(win32_http_destdir)/requests/
-	unix2dos $(win32_http_destdir)/requests/*.xml
+	$(U2D) $(win32_http_destdir)/requests/*.xml
 	cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt
-	unix2dos $(win32_http_destdir)/requests/readme.txt
+	$(U2D) $(win32_http_destdir)/requests/readme.txt
 
 endif
 
@@ -925,7 +955,7 @@ if BUILD_OSDMENU
 			 cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
 		done; \
 	done
-	unix2dos $(win32_destdir)/osdmenu/*.cfg;
+	$(U2D) $(win32_destdir)/osdmenu/*.cfg;
 	for file in $(win32_destdir)/osdmenu/*.cfg; do \
 		sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
 		sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \