Contribs: update LAME to 3.99

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4b92e34ca3a99408478bb3f132e5b53c6795c5ca..5aeb06973b9d6feceb00b35f6f93105f2f3f811b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,6 @@ endif
 SUBDIRS += test
 
 EXTRA_DIST = \
-       HACKING \
        extras/package/win32/vlc.exe.manifest \
        extras/package/win32/libvlc.dll.manifest \
        extras/package/macosx/README.MacOSX.rtf \
@@ -103,10 +102,7 @@ ChangeLog: Makefile.am
 
 EXTRA_DIST += \
        extras/package/macosx/Resources/about_bg.png \
-       extras/package/macosx/Resources/add_embedded.png \
-       extras/package/macosx/Resources/add_embedded_graphite.png \
        extras/package/macosx/Resources/dsa_pub.pem \
-       extras/package/macosx/Resources/embedded_vout.png \
        extras/package/macosx/Resources/English.lproj/About.xib \
        extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
        extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
@@ -146,6 +142,33 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/fspanel/fs_volume_slider_bar.png \
        extras/package/macosx/Resources/fspanel/fs_volume_slider_knob.png \
        extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight.png \
+       extras/package/macosx/Resources/fspanel/fs_background@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_forward@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_forward_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_pause@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_pause_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_play@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_play_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_rewind@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_rewind_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_skip_next@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_skip_previous@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_stop@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_stop_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_time_slider@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_time_slider_knob@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_max@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_mute@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@x1.5.png \
+       extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@x1.5.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 \
@@ -170,7 +193,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/back-pressed.png \
        extras/package/macosx/Resources/mainwindow/back.png \
        extras/package/macosx/Resources/mainwindow/bottom-background.png \
-       extras/package/macosx/Resources/mainwindow/bottom-bar-mini.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/effects-double-buttons-blue.png \
@@ -210,7 +233,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/repeat-pressed.png \
        extras/package/macosx/Resources/mainwindow/repeat.png \
        extras/package/macosx/Resources/mainwindow/shuffle-blue-pressed.png \
-       extras/package/macosx/Resources/mainwindow/shuffle-on.png \
+       extras/package/macosx/Resources/mainwindow/shuffle-blue.png \
        extras/package/macosx/Resources/mainwindow/shuffle-pressed.png \
        extras/package/macosx/Resources/mainwindow/shuffle.png \
        extras/package/macosx/Resources/mainwindow/stop-pressed.png \
@@ -222,6 +245,7 @@ EXTRA_DIST += \
        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/bottom-background_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \
@@ -263,10 +287,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/volume-slider-knob_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/volume-slider-track_dark.png \
        extras/package/macosx/Resources/noart.png \
-       extras/package/macosx/Resources/pause_embedded.png \
-       extras/package/macosx/Resources/pause_embedded_graphite.png \
-       extras/package/macosx/Resources/play_embedded.png \
-       extras/package/macosx/Resources/play_embedded_graphite.png \
        extras/package/macosx/Resources/prefs/spref_cone_Audio_64.png \
        extras/package/macosx/Resources/prefs/spref_cone_Hotkeys_64.png \
        extras/package/macosx/Resources/prefs/spref_cone_Input_64.png \
@@ -274,11 +294,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/prefs/spref_cone_Subtitles_64.png \
        extras/package/macosx/Resources/prefs/spref_cone_Video_64.png \
        extras/package/macosx/Resources/README \
-       extras/package/macosx/Resources/repeat_embedded.png \
-       extras/package/macosx/Resources/repeat_embedded_graphite.png \
-       extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
-       extras/package/macosx/Resources/shuffle_embedded.png \
-       extras/package/macosx/Resources/shuffle_embedded_graphite.png \
        extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png \
        extras/package/macosx/Resources/sidebar-icons/film-cast.png \
        extras/package/macosx/Resources/sidebar-icons/film.png \
@@ -286,10 +301,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/sidebar-icons/network-cloud.png \
        extras/package/macosx/Resources/sidebar-icons/picture.png \
        extras/package/macosx/Resources/sidebar-icons/README \
-       extras/package/macosx/Resources/skip_forward_active_embedded.png \
-       extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
-       extras/package/macosx/Resources/skip_previous_active_embedded.png \
-       extras/package/macosx/Resources/skip_previous_embedded_graphite.png \
        extras/package/macosx/Resources/vlc.scriptSuite \
        extras/package/macosx/Resources/vlc.scriptTerminology \
        extras/package/macosx/fullscreen_panel.svg \