X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6ba5296df51640315b1a40290320633b186a5ae2;hb=78ab1ef2678ca93f5a5686f9f2a746ad6a4307f4;hp=08236214487cf4cbcb599535476526e52b1382dd;hpb=f5e900bebbc632f36190edd5cdd71273e669abff;p=vlc diff --git a/Makefile.am b/Makefile.am index 0823621448..6ba5296df5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,8 @@ EXTRA_DIST = \ extras/package/rpm/vlc.altlinux.spec \ extras/package/win32/vlc.win32.nsi.in \ extras/package/win32/spad.nsi.in \ + extras/package/win32/UAC.nsh \ + extras/package/win32/UAC.dll \ extras/package/win32/languages/declaration.nsh \ extras/package/win32/languages/english.nsh \ extras/package/win32/languages/french.nsh @@ -68,9 +70,12 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ + --disable-a52 \ + --disable-avcodec --disable-avformat \ + --disable-postproc --disable-swscale \ --disable-dbus \ - --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-skins2 \ + --disable-mad --disable-libmpeg2 \ + --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx @@ -327,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 @@ -640,7 +645,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib touch $(top_builddir)/VLC.app/Contents/MacOS/VLC chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC - ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules + ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins install -d $(top_builddir)/VLC.app/Contents/MacOS/share for i in `ls $(srcdir)/share`; do \ ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \ @@ -707,7 +712,7 @@ 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)/ @@ -717,8 +722,7 @@ package-win-common: cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \ - || true ; \ + "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \ done mkdir -p $(win32_destdir)/locale/qt4/ cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true @@ -735,8 +739,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 @@ -746,9 +749,13 @@ endif find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi -package-win32-xpi: package-win-common-strip +# Copy the UAC NSIS plugin + mkdir -p "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS" + +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 \ @@ -764,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 @@ -788,51 +804,45 @@ if USE_PEFLAGS done endif -# Copy the lua scripts (HTTP) if BUILD_LUA +# Copy the lua scripts (HTTP) mkdir -p "$(win32_lua_destdir)/http/images" mkdir -p "$(win32_lua_destdir)/http/requests" 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 -endif + $(U2D) $(win32_lua_destdir)/http/requests/readme.txt -if BUILD_LUA #Lua Scripts $(INSTALL) -d $(win32_lua_destdir) for i in $(srcdir)/share/lua/*.* ; do \ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \ done - $(INSTALL) -d $(win32_lua_destdir)/playlist - for i in $(srcdir)/share/lua/playlist/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/meta/art - for i in $(srcdir)/share/lua/meta/art/*.lua ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \ + $(INSTALL) -d $(win32_lua_destdir)/modules + for i in $(srcdir)/share/lua/modules/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \ done - $(INSTALL) -d $(win32_lua_destdir)/meta/reader - for i in $(srcdir)/share/lua/meta/reader/*.lua ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \ + $(INSTALL) -d $(win32_lua_destdir)/extensions + for i in $(srcdir)/share/lua/extensions/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \ done $(INSTALL) -d $(win32_lua_destdir)/intf for i in $(srcdir)/share/lua/intf/*.* ; do \ @@ -842,6 +852,35 @@ if BUILD_LUA for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ done + $(INSTALL) -d $(win32_lua_destdir)/meta/art + for i in $(srcdir)/share/lua/meta/art/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher + for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta/reader + for i in $(srcdir)/share/lua/meta/reader/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/sd + for i in $(srcdir)/share/lua/sd/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \ + done + + $(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 @@ -851,23 +890,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 @@ -894,7 +933,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$$? ; \ @@ -1120,7 +1159,7 @@ package-macosx-zip: VLC-release.app $(top_builddir)/vlc-$(VERSION)/Goodies cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \ $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf - zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) + zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) package-macosx-framework-zip: @@ -1132,7 +1171,7 @@ package-macosx-framework-zip: for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \ done - zip -r $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) + zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) package-macosx-plugin: