]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
macosx: restructure and unify naming of new yosemite icons
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8adbfd28527c5ee2b1b207272b129759f7fc8819..b609cc5c5dc522764184f9eb191daa2d126479ca 100644 (file)
--- 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
@@ -102,16 +118,24 @@ EXTRA_DIST += \
        extras/package/macosx/VLC.entitlements \
        extras/package/macosx/Resources/dsa_pub.pem \
        extras/package/macosx/Resources/English.lproj/About.xib \
+       extras/package/macosx/Resources/English.lproj/AddonManager.xib \
        extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
        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/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 \
@@ -195,8 +219,10 @@ EXTRA_DIST += \
        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/back-pressed-single.png \
-       extras/package/macosx/Resources/mainwindow/back-single.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 \
@@ -211,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-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-pressed-single.png \
-       extras/package/macosx/Resources/mainwindow/forward-single.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 +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 \
@@ -252,6 +286,10 @@ EXTRA_DIST += \
        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/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 \
@@ -303,6 +341,10 @@ EXTRA_DIST += \
        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 \
@@ -318,12 +360,18 @@ EXTRA_DIST += \
        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/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 \
@@ -332,6 +380,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 \
@@ -352,6 +404,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 \
@@ -491,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 \
@@ -522,7 +571,8 @@ EXTRA_DIST += \
 EXTRA_DIST += \
        extras/tools/bootstrap \
        extras/tools/packages.mak \
-       extras/tools/tools.mak
+       extras/tools/tools.mak \
+       extras/tools/ragel-6.8-javacodegen.patch
 
 ###############################################################################
 # Various utilities ( editor syntax files, D-Bus controller ... )
@@ -549,7 +599,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)
@@ -626,10 +676,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
 ###############################################################################
@@ -643,4 +689,5 @@ update-po:
 ###############################################################################
 include extras/package/macosx/package.mak
 include extras/package/win32/package.mak
+include extras/package/win32/msi.mak
 
Unnamed repository; edit this file 'description' to name the repository.