X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=f78babb4115bdaa7243cc1f939f9c59a0290e980;hb=50f1d61d6da3e6fdb67420133bd8e5d080064e11;hp=54b0ee3db0e327158b38629e4ef458f58bb236ba;hpb=93a913a0afa3901da551c9f724ef121e5ff713e8;p=vlc diff --git a/Makefile.am b/Makefile.am index 54b0ee3db0..f78babb411 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,11 @@ # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. -# - src (libvlc) is nedeed by modules, mozilla and bindings +# - src (libvlc) is nedeed by modules # - libs/* are needed by modules BASE_SUBDIRS = po compat src bin modules share doc test -EXTRA_SUBDIRS = m4 extras/package/ipkg \ - libs/loader libs/srtp libs/unzip \ - projects/mozilla projects/activex +EXTRA_SUBDIRS = m4 \ + libs/loader libs/srtp libs/unzip DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) SUBDIRS = po compat src @@ -29,17 +28,10 @@ if BUILD_VLC SUBDIRS += bin endif SUBDIRS += modules share doc test -if BUILD_MOZILLA -SUBDIRS += projects/mozilla -endif -if BUILD_ACTIVEX -SUBDIRS += projects/activex -endif EXTRA_DIST = \ HACKING \ INSTALL.win32 \ - INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ extras/package/win32/libvlc.dll.manifest \ extras/package/macosx/README.MacOSX.rtf \ @@ -75,10 +67,14 @@ EXTRA_DIST = \ extras/package/win32/languages/sorani.nsh \ extras/package/win32/languages/spanish.nsh -dist_noinst_SCRIPTS = bootstrap toolbox +dist_noinst_SCRIPTS = bootstrap nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +BUILT_SOURCES_distclean = vlc-config +if HAVE_WIN32 +BUILT_SOURCES_distclean += \ + extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +endif if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -99,14 +95,15 @@ DISTCHECK_CONFIGURE_FLAGS = \ --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx \ + --disable-mkv \ --with-kde-solid='$${datadir}/kde4/apps' ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = \ - 1.9 \ + 1.11 \ -Wall \ check-news \ - dist-bzip2 \ + dist-xz \ no-dist-gzip # std-options @@ -297,10 +294,6 @@ EXTRA_DIST += \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ - extras/package/macosx/plugin/Info.plist.in \ - extras/package/macosx/plugin/InstallerInfo.plist.in \ - extras/package/macosx/plugin/InstallerDescription.plist \ - extras/package/macosx/plugin/pbdevelopment.plist \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -324,9 +317,6 @@ EXTRA_DIST += \ extras/misc/mpris.py \ extras/misc/mpris.glade -dist-hook: - distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib - ############################################################################### # Building libvlc ############################################################################### @@ -695,17 +685,35 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ############################################################################ ## Win ## ############################################################################ +destdir=$(prefix) win32_destdir=$(top_builddir)/vlc-$(VERSION) -win32_xpi_destdir=$(win32_destdir)/vlc-plugin win32_debugdir=$(top_builddir)/symbols-$(VERSION) -npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT) -axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT) win32_lua_destdir=$(win32_destdir)/lua -win32_http_destdir=$(win32_destdir)/http -destdir=$(prefix) +win32_xpi_destdir=$(win32_destdir)/vlc-plugin + +if HAVE_WIN64 +build-npapi: + touch $@ + +build-activex: + touch $@ +else +if HAVE_WINCE +build-npapi: + touch $@ + +build-activex: + touch $@ +else +if HAVE_WIN32 +include extras/package/npapi.am +include extras/package/activex.am +endif +endif +endif #Win-common is for win32 and wince -package-win-common: install +package-win-common: install build-npapi build-activex # Check that tmp isn't in the way @if test -e "$(win32_destdir)"; then \ echo "Error: please remove $(win32_destdir), it is in the way"; \ @@ -714,12 +722,12 @@ package-win-common: install echo "Error: please remove $(win32_debugdir), it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(win32_debugdir)"; \ - echo "OK."; mkdir -p "$(win32_destdir)"; \ + echo "Debug dir OK."; mkdir -p "$(win32_debugdir)"; \ + echo "Dest dir OK."; mkdir -p "$(win32_destdir)"; \ fi # Executables, major libs+manifests - find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" -exec cp {} "$(win32_destdir)/" \; + 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; @@ -731,10 +739,10 @@ package-win-common: install do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done # Necessary icon - cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/ + cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) # Locales - cp -r $(destdir)/share/locale $(win32_destdir) + -cp -r $(destdir)/share/locale $(win32_destdir) # Plugins cp -r $(destdir)/lib/vlc/plugins $(win32_destdir) @@ -788,7 +796,7 @@ if BUILD_LUA endif if BUILD_HTTPD - cp -r $(destdir)/share/vlc/http $(win32_http_destdir) + cp -r $(destdir)/share/vlc/http $(win32_destdir) endif if BUILD_SKINS cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins @@ -801,11 +809,13 @@ if BUILD_OSDMENU rm -f -- "$$file.tmp"; \ done endif -if BUILD_MOZILLA - cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir) +if !HAVE_WIN64 +if !HAVE_WINCE + cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" endif -if BUILD_ACTIVEX - cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir) endif # SDK @@ -814,21 +824,23 @@ endif 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/ +if !HAVE_WIN64 +if !HAVE_WINCE + mkdir -p "$(win32_destdir)/sdk/activex" + cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT + cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/ +endif endif - 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) {} \; + 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 '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -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 -# Strip DLLs package-win-base: package-win-common - find $(win32_destdir) -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' | while read i; \ + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ $(OBJCOPY) --strip-all "$$i" ; \ @@ -840,20 +852,26 @@ package-win-base: package-win-common package-win32-webplugin-common: package-win-base mkdir -p "$(win32_xpi_destdir)/plugins" find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; - cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" +endif 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)" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)" cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins +endif package-win32-crx: package-win32-webplugin-common - cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)" crxmake --pack-extension "$(win32_xpi_destdir)" \ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf +endif package-win32-base-exe: package-win-base # Script installer @@ -882,7 +900,7 @@ package-win32-base-exe: package-win-base eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" package-win32-base-zip: package-win-base -# Create package +# Create package rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) @@ -892,7 +910,7 @@ package-win32-base-debug-zip: package-win-common zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION) package-win32-base-7zip: package-win-base -# Create package +# 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-win-common @@ -912,19 +930,20 @@ package-win32-7zip: package-win32-base-7zip package-win32-cleanup package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup -package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi package-win32: package-win32-no-clean package-win32-cleanup package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup + ####### # WinCE ####### package-wince-base: package-win-base package-wince-base-zip: package-wince-base -# Create package +# Create package rm -f -- vlc-$(VERSION)-wince.zip zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) @@ -1030,49 +1049,6 @@ package-macosx-framework-zip: zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) -package-macosx-plugin: -if BUILD_MOZILLA -# Create Installer - rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true - mkdir -p "$(top_builddir)/macosx-plugin-instdata" - rm -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib" - cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" - rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" - export PACKAGEMAKER= - if test -x /Developer/Tools/packagemaker; then \ - export PACKAGEMAKER=/Developer/Tools/packagemaker; \ - fi; \ - if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \ - export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \ - fi; \ - $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ - -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \ - -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true - rm -rf "$(top_builddir)/macosx-plugin-instdata/" - -# Create disk image - rm -f "$(top_builddir)/vlc-plugin-$(VERSION).dmg"; true - rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)/"; true - mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/" - mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/" - hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \ - "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \ - -scrub -imagekey zlib-level=9 - echo "Disk image creation completed:" - rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" -endif - -package-macosx-xpi: -if BUILD_MOZILLA - mkdir -p "$(top_builddir)/macosx-xpi/plugins" - cp $(top_builddir)/projects/mozilla/install.rdf \ - "$(top_builddir)/macosx-xpi/" - cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \ - "$(top_builddir)/macosx-xpi/plugins" - cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins -endif - package-translations: @if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \ echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \