macosx/StringUtility: move lost declaration

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5174963c97ef29776cb4547383b5cdaebca26b09..ec653b963e63518f454e30859475933b9f4f5308 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,12 +191,14 @@ 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 \
@@ -213,12 +215,14 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/effects-one-button-blue@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 \
@@ -234,6 +238,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 \
@@ -242,12 +250,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 \
@@ -295,10 +311,14 @@ 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-pressed_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/back_dark@2x.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 \
@@ -316,10 +336,14 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward_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 \
@@ -328,6 +352,10 @@ EXTRA_DIST += \
        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 \
@@ -336,6 +364,10 @@ EXTRA_DIST += \
        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 \
@@ -344,6 +376,10 @@ EXTRA_DIST += \
        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 \
@@ -568,7 +604,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)
@@ -592,9 +628,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