X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=7e49877704318742bf4c87ea9f009c5b1e634751;hb=6449a22a1eed3cf1b6b97d7d7145abf0b4b0bf67;hp=55098dda440a9d62d9abb8da5ed6c374093eae31;hpb=8ba3d7f4ddefce1678dfbfbe381d38184e3b3393;p=vlc diff --git a/Makefile.am b/Makefile.am index 55098dda44..7e49877704 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,45 +16,59 @@ SUBDIRS += test EXTRA_DIST = \ extras/package/win32/vlc.exe.manifest \ extras/package/win32/libvlc.dll.manifest \ - extras/package/win32/peflags.pl \ extras/package/win32/change-contribs-directory.sh \ extras/package/win32/configure.sh \ extras/package/symbian/configure.sh \ extras/package/npapi.am \ - 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/bengali.nsh \ - extras/package/win32/languages/basque.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/estonian.nsh \ - extras/package/win32/languages/finnish.nsh \ - extras/package/win32/languages/french.nsh \ - extras/package/win32/languages/galician.nsh \ - extras/package/win32/languages/german.nsh \ - extras/package/win32/languages/hebrew.nsh \ - extras/package/win32/languages/hungarian.nsh \ - extras/package/win32/languages/italian.nsh \ - extras/package/win32/languages/japanese.nsh \ - extras/package/win32/languages/lithuanian.nsh \ - extras/package/win32/languages/occitan.nsh \ - extras/package/win32/languages/polish.nsh \ - extras/package/win32/languages/punjabi.nsh \ - extras/package/win32/languages/russian.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 \ - extras/package/win32/languages/swedish.nsh + extras/package/win32/NSIS/vlc.win32.nsi.in \ + extras/package/win32/NSIS/spad.nsi.in \ + extras/package/win32/NSIS/UAC/examples \ + extras/package/win32/NSIS/UAC/examples/UAC_AllowLUA.nsi \ + extras/package/win32/NSIS/UAC/examples/UAC_AdminOnly.nsi \ + extras/package/win32/NSIS/UAC/examples/UAC_Uninstaller.nsi \ + extras/package/win32/NSIS/UAC/examples/UAC.nsh \ + extras/package/win32/NSIS/UAC/examples/UAC_GetUserShellFolderPath.nsi \ + extras/package/win32/NSIS/UAC/examples/UAC_RealWorldFullyLoadedDualModeExample.nsi \ + extras/package/win32/NSIS/UAC/History.txt \ + extras/package/win32/NSIS/UAC/License.txt \ + extras/package/win32/NSIS/UAC/nsisutil.h \ + extras/package/win32/NSIS/UAC/resource.h \ + extras/package/win32/NSIS/UAC/resource.rc \ + extras/package/win32/NSIS/UAC/runas.cpp \ + extras/package/win32/NSIS/UAC/uac.cpp \ + extras/package/win32/NSIS/UAC/uac.h \ + extras/package/win32/NSIS/UAC/Readme.html \ + extras/package/win32/NSIS/UAC.nsh \ + extras/package/win32/NSIS/languages/declaration.nsh \ + extras/package/win32/NSIS/languages/bengali.nsh \ + extras/package/win32/NSIS/languages/basque.nsh \ + extras/package/win32/NSIS/languages/brazilian_portuguese.nsh \ + extras/package/win32/NSIS/languages/bulgarian.nsh \ + extras/package/win32/NSIS/languages/catalan.nsh \ + extras/package/win32/NSIS/languages/danish.nsh \ + extras/package/win32/NSIS/languages/dutch.nsh \ + extras/package/win32/NSIS/languages/english.nsh \ + extras/package/win32/NSIS/languages/estonian.nsh \ + extras/package/win32/NSIS/languages/finnish.nsh \ + extras/package/win32/NSIS/languages/french.nsh \ + extras/package/win32/NSIS/languages/galician.nsh \ + extras/package/win32/NSIS/languages/german.nsh \ + extras/package/win32/NSIS/languages/hebrew.nsh \ + extras/package/win32/NSIS/languages/hungarian.nsh \ + extras/package/win32/NSIS/languages/italian.nsh \ + extras/package/win32/NSIS/languages/japanese.nsh \ + extras/package/win32/NSIS/languages/lithuanian.nsh \ + extras/package/win32/NSIS/languages/occitan.nsh \ + extras/package/win32/NSIS/languages/polish.nsh \ + extras/package/win32/NSIS/languages/punjabi.nsh \ + extras/package/win32/NSIS/languages/russian.nsh + extras/package/win32/NSIS/languages/romanian.nsh \ + extras/package/win32/NSIS/languages/schinese.nsh \ + extras/package/win32/NSIS/languages/slovak.nsh \ + extras/package/win32/NSIS/languages/slovenian.nsh \ + extras/package/win32/NSIS/languages/sorani.nsh \ + extras/package/win32/NSIS/languages/spanish.nsh \ + extras/package/win32/NSIS/languages/swedish.nsh dist_noinst_SCRIPTS = bootstrap nodist_noinst_SCRIPTS = compile @@ -68,12 +82,14 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ --disable-a52 \ + --disable-alsa \ --disable-avcodec --disable-avformat \ --disable-postproc --disable-swscale \ --disable-dbus \ --disable-mad --disable-libmpeg2 \ --disable-faad --disable-skins2 \ --disable-live555 \ + --disable-lua \ --disable-fribidi --disable-glx \ --disable-mkv \ --with-kde-solid='$${datadir}/kde4/apps' @@ -90,7 +106,7 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - $(LN_S) -f doc/ChangeLog-2009 "$@" + $(LN_S) -f doc/ChangeLog-2014 "$@" ############################################################################### # Mac OS X project @@ -106,96 +122,77 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/Bookmarks.xib \ extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib \ extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \ + extras/package/macosx/Resources/English.lproj/CrashReporter.xib \ + extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib \ + extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib \ extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \ + extras/package/macosx/Resources/English.lproj/FSPanel.xib \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ extras/package/macosx/Resources/English.lproj/MainMenu.xib \ + extras/package/macosx/Resources/English.lproj/MainWindow.xib \ extras/package/macosx/Resources/English.lproj/MediaInfo.xib \ extras/package/macosx/Resources/English.lproj/Open.xib \ + extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib \ + extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \ extras/package/macosx/Resources/English.lproj/Preferences.xib \ + extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \ extras/package/macosx/Resources/English.lproj/SyncTracks.xib \ extras/package/macosx/Resources/English.lproj/VideoEffects.xib \ extras/package/macosx/Resources/English.lproj/Wizard.xib \ extras/package/macosx/Resources/fspanel/fs_background.png \ extras/package/macosx/Resources/fspanel/fs_background@2x.png \ - extras/package/macosx/Resources/fspanel/fs_background@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_exit_fullscreen.png \ extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@2x.png \ - extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight.png \ extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_forward.png \ extras/package/macosx/Resources/fspanel/fs_forward@2x.png \ - extras/package/macosx/Resources/fspanel/fs_forward@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_forward_highlight.png \ extras/package/macosx/Resources/fspanel/fs_forward_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_forward_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_pause.png \ extras/package/macosx/Resources/fspanel/fs_pause@2x.png \ - extras/package/macosx/Resources/fspanel/fs_pause@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_pause_highlight.png \ extras/package/macosx/Resources/fspanel/fs_pause_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_pause_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_play.png \ extras/package/macosx/Resources/fspanel/fs_play@2x.png \ - extras/package/macosx/Resources/fspanel/fs_play@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_play_highlight.png \ extras/package/macosx/Resources/fspanel/fs_play_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_play_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_rewind.png \ extras/package/macosx/Resources/fspanel/fs_rewind@2x.png \ - extras/package/macosx/Resources/fspanel/fs_rewind@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_rewind_highlight.png \ extras/package/macosx/Resources/fspanel/fs_rewind_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_rewind_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_skip_next.png \ extras/package/macosx/Resources/fspanel/fs_skip_next@2x.png \ - extras/package/macosx/Resources/fspanel/fs_skip_next@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_skip_next_highlight.png \ extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_skip_previous.png \ extras/package/macosx/Resources/fspanel/fs_skip_previous@2x.png \ - extras/package/macosx/Resources/fspanel/fs_skip_previous@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight.png \ extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_stop.png \ extras/package/macosx/Resources/fspanel/fs_stop@2x.png \ - extras/package/macosx/Resources/fspanel/fs_stop@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_stop_highlight.png \ extras/package/macosx/Resources/fspanel/fs_stop_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_stop_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_time_slider.png \ extras/package/macosx/Resources/fspanel/fs_time_slider@2x.png \ - extras/package/macosx/Resources/fspanel/fs_time_slider@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_time_slider_knob.png \ extras/package/macosx/Resources/fspanel/fs_time_slider_knob@2x.png \ - extras/package/macosx/Resources/fspanel/fs_time_slider_knob@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight.png \ extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_max.png \ extras/package/macosx/Resources/fspanel/fs_volume_max@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_max@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_max_highlight.png \ extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_mute.png \ extras/package/macosx/Resources/fspanel/fs_volume_mute@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_mute@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight.png \ extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_bar.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_knob.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@x1.5.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight.png \ extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight@2x.png \ - extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight@x1.5.png \ extras/package/macosx/Resources/icons/aiff.icns \ extras/package/macosx/Resources/icons/audio.icns \ extras/package/macosx/Resources/icons/avi.icns \ @@ -218,17 +215,20 @@ EXTRA_DIST += \ extras/package/macosx/Resources/icons/wav.icns \ extras/package/macosx/Resources/icons/wma.icns \ extras/package/macosx/Resources/icons/wmv.icns \ - extras/package/macosx/Resources/mainwindow/back-pressed-single.png \ - extras/package/macosx/Resources/mainwindow/back-pressed.png \ - extras/package/macosx/Resources/mainwindow/back-pressed@2x.png \ - extras/package/macosx/Resources/mainwindow/back-single.png \ - extras/package/macosx/Resources/mainwindow/back.png \ - extras/package/macosx/Resources/mainwindow/back@2x.png \ + extras/package/macosx/Resources/mainwindow/backward-3btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/backward-3btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/backward-3btns.png \ + extras/package/macosx/Resources/mainwindow/backward-3btns@2x.png \ + extras/package/macosx/Resources/mainwindow/backward-6btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/backward-6btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/backward-6btns.png \ + extras/package/macosx/Resources/mainwindow/backward-6btns@2x.png \ extras/package/macosx/Resources/mainwindow/bottom-background.png \ extras/package/macosx/Resources/mainwindow/bottom-background@2x.png \ extras/package/macosx/Resources/mainwindow/bottombar-mini.png \ extras/package/macosx/Resources/mainwindow/dropzone-background.png \ extras/package/macosx/Resources/mainwindow/dropzone.png \ + extras/package/macosx/Resources/mainwindow/dropzone@2x.png \ extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \ extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue@2x.png \ extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \ @@ -237,14 +237,18 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/effects-double-buttons@2x.png \ extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \ extras/package/macosx/Resources/mainwindow/effects-one-button-blue@2x.png \ + extras/package/macosx/Resources/mainwindow/effects-one-button-pressed.png \ + extras/package/macosx/Resources/mainwindow/effects-one-button-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/effects-one-button.png \ extras/package/macosx/Resources/mainwindow/effects-one-button@2x.png \ - extras/package/macosx/Resources/mainwindow/forward-pressed-single.png \ - extras/package/macosx/Resources/mainwindow/forward-pressed.png \ - extras/package/macosx/Resources/mainwindow/forward-pressed@2x.png \ - extras/package/macosx/Resources/mainwindow/forward-single.png \ - extras/package/macosx/Resources/mainwindow/forward.png \ - extras/package/macosx/Resources/mainwindow/forward@2x.png \ + extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/forward-3btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/forward-3btns.png \ + extras/package/macosx/Resources/mainwindow/forward-3btns@2x.png \ + extras/package/macosx/Resources/mainwindow/forward-6btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/forward-6btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/forward-6btns.png \ + extras/package/macosx/Resources/mainwindow/forward-6btns@2x.png \ extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \ extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \ @@ -260,6 +264,10 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-left.png \ extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-middle.png \ extras/package/macosx/Resources/mainwindow/mini-progressbar-wrapper-right.png \ + extras/package/macosx/Resources/mainwindow/next-6btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/next-6btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/next-6btns.png \ + extras/package/macosx/Resources/mainwindow/next-6btns@2x.png \ extras/package/macosx/Resources/mainwindow/pause-pressed.png \ extras/package/macosx/Resources/mainwindow/pause-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/pause.png \ @@ -268,12 +276,20 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/play-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/play.png \ extras/package/macosx/Resources/mainwindow/play@2x.png \ - extras/package/macosx/Resources/mainwindow/playlist-blue@2x.png \ + extras/package/macosx/Resources/mainwindow/playlist-1btn-pressed.png \ + extras/package/macosx/Resources/mainwindow/playlist-1btn-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/playlist-1btn.png \ + extras/package/macosx/Resources/mainwindow/playlist-1btn@2x.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \ + extras/package/macosx/Resources/mainwindow/playlist-btn-blue@2x.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \ + extras/package/macosx/Resources/mainwindow/playlist-btn-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/playlist-btn.png \ extras/package/macosx/Resources/mainwindow/playlist-btn@2x.png \ - extras/package/macosx/Resources/mainwindow/playlist-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/previous-6btns-pressed.png \ + extras/package/macosx/Resources/mainwindow/previous-6btns-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow/previous-6btns.png \ + extras/package/macosx/Resources/mainwindow/previous-6btns@2x.png \ extras/package/macosx/Resources/mainwindow/progression-fill-left.png \ extras/package/macosx/Resources/mainwindow/progression-fill-left@2x.png \ extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \ @@ -321,68 +337,151 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/volume-slider-knob@2x.png \ extras/package/macosx/Resources/mainwindow/volume-slider-track.png \ extras/package/macosx/Resources/mainwindow/volume-slider-track@2x.png \ - extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \ - extras/package/macosx/Resources/mainwindow_dark/back_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-3btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-3btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-3btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-3btns-dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-6btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-6btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-6btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/backward-6btns-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \ extras/package/macosx/Resources/mainwindow_dark/bottomdark-left.png \ + extras/package/macosx/Resources/mainwindow_dark/bottomdark-left@2x.png \ extras/package/macosx/Resources/mainwindow_dark/bottomdark-right.png \ + extras/package/macosx/Resources/mainwindow_dark/bottomdark-right@2x.png \ extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \ - extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \ - extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-6btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-6btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-6btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/forward-6btns-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/next-6btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/next-6btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/next-6btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/next-6btns-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/pause_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/pause_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/play_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/play_dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-blue_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/playlist_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/playlist_dark@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/previous-6btns-dark-pressed.png \ + extras/package/macosx/Resources/mainwindow_dark/previous-6btns-dark-pressed@2x.png \ + extras/package/macosx/Resources/mainwindow_dark/previous-6btns-dark.png \ + extras/package/macosx/Resources/mainwindow_dark/previous-6btns-dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-left_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-left_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-middle_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-middle_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-right_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progressbar-fill-right_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progression-knob_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progression-knob_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-left_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-left_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-middle_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-middle_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-right_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/progression-track-wrapper-right_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat-all-blue_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat-one-blue_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/repeat_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/repeat_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/shuffle-blue-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/shuffle-blue-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/shuffle-blue_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/shuffle-blue_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/shuffle-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/shuffle-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/shuffle_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/shuffle_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/stop-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/stop-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/stop_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/stop_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over-graphite.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over-graphite@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom@2x.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-on-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-on.png \ @@ -402,12 +501,19 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-over.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom.png \ extras/package/macosx/Resources/mainwindow_dark/topbar-dark-center-fill.png \ + extras/package/macosx/Resources/mainwindow_dark/topbar-dark-center-fill@2x.png \ extras/package/macosx/Resources/mainwindow_dark/topbar-dark-left.png \ + extras/package/macosx/Resources/mainwindow_dark/topbar-dark-left@2x.png \ extras/package/macosx/Resources/mainwindow_dark/topbar-dark-right.png \ + extras/package/macosx/Resources/mainwindow_dark/topbar-dark-right@2x.png \ extras/package/macosx/Resources/mainwindow_dark/volume-high_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/volume-high_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/volume-low_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/volume-low_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/volume-slider-knob_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/volume-slider-knob_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/volume-slider-track_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/volume-slider-track_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png \ extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png \ extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png \ @@ -441,13 +547,6 @@ EXTRA_DIST += \ extras/package/macosx/configure.sh \ extras/package/macosx/dmg_setup.scpt \ extras/package/macosx/vlc.xcodeproj/project.pbxproj \ - extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \ - extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \ - extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \ - extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ - 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/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -499,7 +598,7 @@ EXTRA_DIST += \ ############################################################################### CLEANFILES = -DISTCLEANFILES = $(BUILT_SOURCES_distclean) compile +DISTCLEANFILES = $(BUILT_SOURCES_distclean) compile doltcompile doltlibtool MAINTAINERCLEANFILES = ChangeLog # Shortcut for developers to rebuild the core (libvlc + vlc) @@ -526,7 +625,7 @@ doc: # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -550,9 +649,6 @@ qvlc: make-alias Makefile nvlc: make-alias Makefile $(AM_V_GEN)$(MKALIAS) ncurses -mvlc: make-alias Makefile - $(AM_V_GEN)$(MKALIAS) maemo - if BUILD_VLC noinst_SCRIPTS = vlc$(EXEEXT) endif @@ -579,10 +675,6 @@ install-exec-hook: uninstall-hook: rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat" -silentstd = $(silentstd_$(V)) -silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY)) -silentstd_0 = 2>&1 >/dev/null - ############################################################################### # PO translation files update ############################################################################### @@ -596,4 +688,5 @@ update-po: ############################################################################### include extras/package/macosx/package.mak include extras/package/win32/package.mak +include extras/package/win32/msi.mak