X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=b5b66ea9d518cbd87df103d05b3d6ccda1540e07;hb=e082d19ba57316d6b0cf94fe7811c0e115455819;hp=990a879bdde44546abcc9a0600c5ec06f1dd2d03;hpb=4c930da51936b79c1ec749c1d1cc8d691d12d83e;p=vlc diff --git a/Makefile.am b/Makefile.am index 990a879bdd..b5b66ea9d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,24 +2,35 @@ # Automake targets and declarations ############################################################################### +# Pass --quiet to make when we are not verbose. +AM_MAKEFLAGS = $(makesilentflags_$(V)) +makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY)) +makesilentflags_0 = --quiet +makesilentflags__0 = $(makesilentflags_0) + # 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 # - libs/* are needed by modules -BASE_SUBDIRS = po src bin modules share doc test +BASE_SUBDIRS = po compat src bin modules share doc test EXTRA_SUBDIRS = m4 extras/package/ipkg \ - libs/loader libs/srtp \ + libs/loader libs/srtp libs/unzip \ projects/mozilla projects/activex DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) -SUBDIRS = po src +SUBDIRS = po compat src if LOADER SUBDIRS += libs/loader endif -if HAVE_LIBGCRYPT +if HAVE_GCRYPT SUBDIRS += libs/srtp endif +if HAVE_ZLIB +if !HAVE_MINIZIP +SUBDIRS += libs/unzip +endif +endif if BUILD_VLC SUBDIRS += bin endif @@ -36,13 +47,13 @@ EXTRA_DIST = \ INSTALL.win32 \ INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ - MAINTAINERS \ + extras/package/win32/libvlc.dll.manifest \ extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ extras/package/rpm/vlc.fedora.spec \ - extras/package/rpm/vlc.mandriva.spec \ extras/package/rpm/vlc.altlinux.spec \ extras/package/win32/vlc.win32.nsi.in \ + extras/package/win32/spad.nsi.in \ extras/package/win32/languages/declaration.nsh \ extras/package/win32/languages/english.nsh \ extras/package/win32/languages/french.nsh @@ -50,7 +61,7 @@ EXTRA_DIST = \ dist_noinst_SCRIPTS = bootstrap toolbox nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi +BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -65,7 +76,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ --disable-dbus \ --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ + --disable-ffmpeg --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx @@ -81,74 +92,54 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - ln -sf doc/ChangeLog-2008 "$@" + ln -sf doc/ChangeLog-2009 "$@" ############################################################################### # MacOS X project ############################################################################### EXTRA_DIST += \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ - extras/package/macosx/Resources/a52.icns \ - extras/package/macosx/Resources/aac.icns \ - extras/package/macosx/Resources/asf.icns \ - extras/package/macosx/Resources/asx.icns \ + extras/package/macosx/Resources/dsa_pub.pem \ + extras/package/macosx/Resources/aiff.icns \ + extras/package/macosx/Resources/audio.icns \ extras/package/macosx/Resources/avi.icns \ - extras/package/macosx/Resources/bin.icns \ - extras/package/macosx/Resources/cue.icns \ - extras/package/macosx/Resources/dat.icns \ - extras/package/macosx/Resources/divx.icns \ - extras/package/macosx/Resources/dv.icns \ + extras/package/macosx/Resources/flv.icns \ extras/package/macosx/Resources/generic.icns \ - extras/package/macosx/Resources/m3u.icns \ + extras/package/macosx/Resources/m4a.icns \ + extras/package/macosx/Resources/m4v.icns \ + extras/package/macosx/Resources/mkv.icns \ extras/package/macosx/Resources/mov.icns \ + extras/package/macosx/Resources/movie.icns \ extras/package/macosx/Resources/mp3.icns \ - extras/package/macosx/Resources/mp4.icns \ extras/package/macosx/Resources/mpeg.icns \ - extras/package/macosx/Resources/mpeg1.icns \ - extras/package/macosx/Resources/mpeg2.icns \ - extras/package/macosx/Resources/mpeg4.icns \ - extras/package/macosx/Resources/mpg.icns \ extras/package/macosx/Resources/ogg.icns \ - extras/package/macosx/Resources/ogm.icns \ - extras/package/macosx/Resources/pls.icns \ - extras/package/macosx/Resources/srt.icns \ - extras/package/macosx/Resources/sub.icns \ - extras/package/macosx/Resources/vlc.icns \ + extras/package/macosx/Resources/playlist.icns \ + extras/package/macosx/Resources/rm.icns \ + extras/package/macosx/Resources/subtitle.icns \ extras/package/macosx/Resources/vob.icns \ + extras/package/macosx/Resources/wav.icns \ + extras/package/macosx/Resources/vlc.icns \ extras/package/macosx/Resources/wma.icns \ extras/package/macosx/Resources/wmv.icns \ extras/package/macosx/Resources/pause.png \ @@ -246,6 +237,28 @@ EXTRA_DIST += \ extras/package/macosx/Resources/skip_previous_graphite.png \ extras/package/macosx/Resources/stop_graphite.png \ extras/package/macosx/Resources/volumeslider_graphite.png \ + extras/package/macosx/Resources/backward_big_down.png \ + extras/package/macosx/Resources/backward_big.png \ + extras/package/macosx/Resources/eq_sm.pdf \ + extras/package/macosx/Resources/forward_big_down.png \ + extras/package/macosx/Resources/forward_big.png \ + extras/package/macosx/Resources/fs_sm.pdf \ + extras/package/macosx/Resources/list_sm.pdf \ + extras/package/macosx/Resources/next_sm.pdf \ + extras/package/macosx/Resources/pause_big_down.png \ + extras/package/macosx/Resources/pause_big.png \ + extras/package/macosx/Resources/play_big_down.png \ + extras/package/macosx/Resources/play_big.png \ + extras/package/macosx/Resources/prev_sm.pdf \ + extras/package/macosx/Resources/sidebarAdd.png \ + extras/package/macosx/Resources/sidebarRepeat.png \ + extras/package/macosx/Resources/sidebarRepeatOn.png \ + extras/package/macosx/Resources/sidebarRepeatOneOn.png \ + extras/package/macosx/Resources/sidebarResizeWidget.png \ + extras/package/macosx/Resources/sidebarShuffle.png \ + extras/package/macosx/Resources/sidebarShuffleOn.png \ + extras/package/macosx/Resources/sidebarStatusAreaBackground.png \ + extras/package/macosx/Resources/stop_sm.pdf \ extras/package/macosx/Resources/noart.png \ extras/package/macosx/Resources/spref_cone_Audio_64.png \ extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \ @@ -267,7 +280,6 @@ EXTRA_DIST += \ extras/package/macosx/plugin/InstallerInfo.plist.in \ extras/package/macosx/plugin/InstallerDescription.plist \ extras/package/macosx/plugin/pbdevelopment.plist \ - extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -309,12 +321,16 @@ vlc-config.in: vlc-config.in.in touch $@ CLEANFILES = $(BUILT_SOURCES_clean) -DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile +MAINTAINERCLEANFILES = ChangeLog -# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Shortcut for developers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch -libvlc: +libcompat: + cd compat && $(MAKE) $(AM_MAKEFLAGS) + +libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la core: libvlc @@ -341,9 +357,9 @@ vlc-bundle: vlc cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ fi ; \ done - if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ + if test -d $(CONTRIB_DIR)/vlc-lib ; then \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \ - for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ + for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi @@ -359,7 +375,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -368,62 +384,63 @@ dist_noinst_SCRIPTS += make-alias MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ -cvlc: make-alias +cvlc: make-alias Makefile $(MKALIAS) dummy -rvlc: make-alias +rvlc: make-alias Makefile $(MKALIAS) rc -svlc: make-alias +svlc: make-alias Makefile $(MKALIAS) skins2 -wxvlc: make-alias - $(MKALIAS) wx - -qvlc: make-alias +qvlc: make-alias Makefile $(MKALIAS) qt4 -nvlc: make-alias +nvlc: make-alias Makefile $(MKALIAS) ncurses -mvlc: make-alias +mvlc: make-alias Makefile $(MKALIAS) maemo if BUILD_VLC noinst_SCRIPTS += vlc$(EXEEXT) endif -vlc$(EXEEXT): Makefile.am - rm -f -- vlc vlc.tmp - echo '#! /bin/sh' > vlc.tmp - echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp - chmod +x vlc.tmp - mv -f -- vlc.tmp vlc +vlc$(EXEEXT): + ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN -if BUILD_VLC +if BUILD_MACOSX_VLC_APP # Create the MacOS X app noinst_DATA = VLC.app endif endif +silentstd = $(silentstd_$(V)) +silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY)) +silentstd_0 = 2>&1 >/dev/null +# '__' prefix trick for old automake version. +silentstd__0 = $(silentstd_0) + # VLC-release.app for packaging and giving it to your friends # use package-macosx to get a nice dmg VLC-release.app: vlc - ( cd src && make install ) + ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) ) rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe` && \ + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -464,10 +481,8 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -476,10 +491,10 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app; \ + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh @@ -526,13 +541,9 @@ VLC-release.app: vlc $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts - $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done @@ -542,15 +553,6 @@ VLC-release.app: vlc for i in $(srcdir)/share/http/js/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ done - for i in $(srcdir)/share/http/old/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/admin/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/vlm/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ - done for i in $(srcdir)/share/http/images/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ done @@ -569,28 +571,29 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete; - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete; + find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete; find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; # This is just for development purposes. -# The resulting VLC.app will only in this tree. +# The resulting VLC.app will only run in this tree. VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib - (cd src && make install) + $(AM_V_GEN)(cd src && make install $(silentstd)) rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe` && \ + REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -631,10 +634,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -643,10 +644,10 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS touch $(top_builddir)/VLC.app/Contents/MacOS/VLC chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC @@ -680,6 +681,10 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ## Win ## ############################################################################ 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 @@ -692,23 +697,32 @@ package-win-common: else \ echo "OK."; mkdir -p "$(win32_destdir)"; \ fi +# Same for debug symbols dir + @if test -e "$(win32_debugdir)"; then \ + echo "Error: please remove $(win32_debugdir), it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(win32_debugdir)"; \ + fi # Copy relevant files -# Copy executables and libs +# Copy executables, major libs+manifests cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" + cp "$(top_builddir)/bin/.libs/vlc-cache-gen$(EXEEXT)" "$(win32_destdir)/" cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/" + cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" # Copy Text files - for file in AUTHORS MAINTAINERS THANKS ; \ + for file in AUTHORS THANKS ; \ 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" # Necessary icons - cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/ + cp $(srcdir)/share/vlc.ico $(win32_destdir)/ # Copy the locales mkdir -p $(win32_destdir)/locale @@ -725,6 +739,7 @@ package-win-common: if BUILD_MOZILLA mkdir -p "$(win32_destdir)/mozilla" cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/ endif # ActiveX plugin @@ -735,6 +750,7 @@ if BUILD_ACTIVEX unix2dos $(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 # Rebase all those DLLs to speed up loading (need cygwin rebase) @@ -742,10 +758,31 @@ endif find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi +package-win32-xpi: 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 \ + "$(win32_xpi_destdir)/plugins" + cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" \ + "$(win32_xpi_destdir)/plugins" + cp "$(win32_destdir)/libvlccore$(LIBEXT)" \ + "$(win32_xpi_destdir)/plugins" + cp "$(win32_destdir)/libvlc$(LIBEXT)" \ + "$(win32_xpi_destdir)/plugins" + mkdir -p "$(win32_xpi_destdir)/plugins/plugins" + cp $(win32_destdir)/plugins/*$(LIBEXT) \ + "$(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-base-debug: package-win-common # Copy relevant files # Script installer cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" + cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" mkdir "$(win32_destdir)/languages" cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" @@ -756,8 +793,12 @@ package-win32-base-debug: package-win-common $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \ fi ; done -# Contrib *.dll's - cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true +#Enable DEP and ASLR for all the binaries +if USE_PEFLAGS + find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \ + $(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \ + done +endif # Copy the lua scripts (HTTP) if BUILD_LUA @@ -773,6 +814,8 @@ if BUILD_LUA unix2dos $(win32_lua_destdir)/http/*.css cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/ unix2dos $(win32_lua_destdir)/http/js/*.js + cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/*.lua cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/ unix2dos $(win32_lua_destdir)/http/dialogs/* cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/ @@ -795,9 +838,13 @@ if BUILD_LUA 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 - for i in $(srcdir)/share/lua/meta/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \ + $(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}` ; \ + 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}` ; \ done $(INSTALL) -d $(win32_lua_destdir)/intf for i in $(srcdir)/share/lua/intf/*.* ; do \ @@ -815,9 +862,6 @@ if BUILD_HTTPD mkdir -p "$(win32_http_destdir)/requests" mkdir -p "$(win32_http_destdir)/js" mkdir -p "$(win32_http_destdir)/dialogs" - mkdir -p "$(win32_http_destdir)/old" - mkdir -p "$(win32_http_destdir)/old/vlm" - mkdir -p "$(win32_http_destdir)/old/admin" cp $(srcdir)/share/http/*.html $(win32_http_destdir)/ unix2dos $(win32_http_destdir)/*.html cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/ @@ -837,16 +881,6 @@ if BUILD_HTTPD cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt unix2dos $(win32_http_destdir)/requests/readme.txt - cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/ - unix2dos $(win32_http_destdir)/old/*.html - cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/ - cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/ - unix2dos $(win32_http_destdir)/old/vlm/*.html - cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/ - unix2dos $(win32_http_destdir)/old/admin/*.html - cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/ endif if BUILD_SKINS @@ -858,15 +892,17 @@ if BUILD_SKINS for i in $(top_builddir)/share/skins2/*.*; do \ cp -- "$$i" $(win32_destdir)/skins/ || true ; \ done + cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ; + cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ; endif if BUILD_OSDMENU #OSD Menu mkdir -p "$(win32_destdir)/osdmenu" cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" - for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ + for dir in default default/selected default/selection default/volume ;do \ mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \ + for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \ cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \ done; \ done @@ -888,21 +924,23 @@ endif find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir rm -Rf vlc-$(VERSION)/sdk/bin -#strip exe and main dll +# Strip DLLs package-win-common-strip: package-win32-base-debug - for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done -if BUILD_MOZILLA - $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)" -endif -if BUILD_ACTIVEX - $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)" -endif + for i in "" $(win32_destdir)/*$(LIBEXT) \ + $(win32_destdir)/*$(EXEEXT) \ + $(win32_destdir)/activex/*$(LIBEXT) \ + $(win32_destdir)/mozilla/*$(LIBEXT) \ + $(win32_destdir)/plugins/*$(LIBEXT) \ + ; do \ + if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-all "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi ; \ + done -#strip all plugins dll package-win32-base: package-win-common-strip - for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done package-win32-base-exe: package-win32-base # Create package @@ -918,6 +956,7 @@ package-win32-base-exe: package-win32-base else \ echo 'Error: cannot locate makensis tool'; exit 1; \ fi; \ + eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" package-win32-base-zip: package-win32-base @@ -938,45 +977,37 @@ package-win32-base-debug-7zip: package-win32-base-debug # Create package 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION) -package-win32-exe: package-win32-base package-win32-base-exe -# Clean up +package-win32-cleanup: rm -Rf $(win32_destdir) + rm -Rf $(win32_debugdir) -package-win32-zip: package-win32-base-zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup -package-win32-debug-zip: package-win32-base-debug-zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-zip: package-win32-base-zip package-win32-cleanup -package-win32-7zip: package-win32-base-7zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup -package-win32-debug-7zip: package-win32-base-debug-7zip -# Clean up - rm -Rf $(win32_destdir) +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: package-win32-no-clean -# Clean up - rm -Rf $(win32_destdir) +package-win32: package-win32-no-clean package-win32-cleanup -package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip -# Clean up - rm -Rf $(win32_destdir) +package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup -package-wince-base: package-win-common package-win-common-strip +####### +# WinCE +####### +package-wince-base: package-win-common-strip -package-wince-base-zip: +package-wince-base-zip: package-wince-base # Create package - zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION) + rm -f -- vlc-$(VERSION)-wince.zip + zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) -package-wince: package-wince-base package-wince-base-zip -# Clean up - rm -Rf $(win32_destdir) +package-wince: package-wince-base-zip package-win32-cleanup ##################################################################### @@ -1035,12 +1066,13 @@ package-macosx: VLC-release.app ChangeLog else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ fi - cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ - cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ - cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ - cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ - cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/ # Place a link to the application folder ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications @@ -1078,7 +1110,7 @@ package-macosx: VLC-release.app ChangeLog # Note: We can't directly create a read only dmg as we do the bless stuff echo "Make the disk image read-only" mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" - hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" + hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg" rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" # We are done @@ -1120,6 +1152,7 @@ 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= @@ -1131,8 +1164,8 @@ if BUILD_MOZILLA fi; \ $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \ - -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true + -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 @@ -1141,12 +1174,22 @@ if BUILD_MOZILLA 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 UDZO \ + "$(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"; \ @@ -1177,37 +1220,12 @@ package-translations: ############################################################################### # PO translation files update -# Generate po/POTFILES.in which lists all the files containing translatable -# strings. Find all source files and remove the generated files ############################################################################### .PHONY: update-po update-po: - rm -f $(top_srcdir)/po/POTFILES.in - { \ - cd $(top_srcdir) && \ - echo "# automatically created by make update-po" ; \ - echo "" ; \ - echo "# main sources" ; \ - find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \ - | sort ; \ - echo "" ; \ - echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \ - | grep -v '\(\.moc\.\|gui/gtk2/\)' \ - | grep -vE 'qt4/ui/.*.h' \ - | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ - | grep -v 'gui/opie' \ - | grep -v 'wxwidgets' \ - | grep -v 'mux/rtp/' \ - | grep -v 'demux/rtpxiph.c' \ - | sort ; \ - } > $(top_srcdir)/po/POTFILES.in - rm -f $(top_srcdir)/po/vlc.pot cd po && $(MAKE) POTFILES vlc.pot update-po -#cd po && $(MAKE) update-po ############################################################################### # Enforce Mac OS X deployment target environment variable