X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e79bdaee39cc8ab5c4667013369a5c5e99673449;hb=52197b014bebfd9744aac4ad34f3e3d379abd53c;hp=996970eac6adeeeb7bf76ab715a671f01de019fb;hpb=79b982141109d5d6bf299f247b6b2efedc069817;p=vlc diff --git a/Makefile.am b/Makefile.am index 996970eac6..e79bdaee39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,8 @@ EXTRA_DIST = \ extras/package/win32/peflags.pl \ extras/package/win32/change-contribs-directory.sh \ extras/package/win32/configure.sh \ - extras/package/macosx/README.MacOSX.rtf \ - extras/package/rpm/vlc.fedora.spec \ - extras/package/rpm/vlc.altlinux.spec \ + 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 \ @@ -38,7 +37,9 @@ EXTRA_DIST = \ 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 \ @@ -46,12 +47,14 @@ EXTRA_DIST = \ 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/spanish.nsh \ + extras/package/win32/languages/swedish.nsh dist_noinst_SCRIPTS = bootstrap nodist_noinst_SCRIPTS = compile @@ -90,10 +93,11 @@ ChangeLog: Makefile.am $(LN_S) -f doc/ChangeLog-2009 "$@" ############################################################################### -# MacOS X project +# Mac OS X project ############################################################################### EXTRA_DIST += \ + extras/package/macosx/README.MacOSX.rtf \ extras/package/macosx/Resources/about_bg.png \ extras/package/macosx/Resources/dsa_pub.pem \ extras/package/macosx/Resources/English.lproj/About.xib \ @@ -101,6 +105,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/Bookmarks.xib \ extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \ extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \ + extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ extras/package/macosx/Resources/English.lproj/MainMenu.xib \ extras/package/macosx/Resources/English.lproj/MediaInfo.xib \ extras/package/macosx/Resources/English.lproj/Open.xib \ @@ -179,6 +184,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/icons/rm.icns \ extras/package/macosx/Resources/icons/subtitle.icns \ extras/package/macosx/Resources/icons/vlc.icns \ + extras/package/macosx/Resources/icons/vlc-xmas.png \ extras/package/macosx/Resources/icons/vob.icns \ extras/package/macosx/Resources/icons/wav.icns \ extras/package/macosx/Resources/icons/wma.icns \ @@ -198,6 +204,8 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/forward.png \ extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \ extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \ + extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png \ + extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png \ extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-left.png \ extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-middle.png \ extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-right.png \ @@ -231,6 +239,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow/shuffle.png \ extras/package/macosx/Resources/mainwindow/stop-pressed.png \ extras/package/macosx/Resources/mainwindow/stop.png \ + extras/package/macosx/Resources/mainwindow/topbar_background.png \ extras/package/macosx/Resources/mainwindow/volume-high.png \ extras/package/macosx/Resources/mainwindow/volume-low.png \ extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \ @@ -239,6 +248,8 @@ EXTRA_DIST += \ 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/bottomdark-left.png \ + extras/package/macosx/Resources/mainwindow_dark/bottomdark-right.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 \ @@ -248,6 +259,8 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \ extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png \ + extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png \ extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark.png \ extras/package/macosx/Resources/mainwindow_dark/pause_dark.png \ extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark.png \ @@ -284,8 +297,8 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-graphite.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.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-graphite.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.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-on-graphite.png \ @@ -299,11 +312,11 @@ EXTRA_DIST += \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close.png \ + extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over.png \ - extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-graphite.png \ extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-on-graphite.png \ @@ -338,8 +351,12 @@ EXTRA_DIST += \ extras/package/macosx/Resources/sidebar-icons/sidebar-podcast.png \ extras/package/macosx/Resources/vlc.scriptSuite \ extras/package/macosx/Resources/vlc.scriptTerminology \ + extras/package/macosx/build-package.sh \ extras/package/macosx/fullscreen_panel.svg \ extras/package/macosx/ub.sh \ + extras/package/macosx/build.sh \ + 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 \ @@ -360,6 +377,19 @@ EXTRA_DIST += \ extras/package/macosx/README.MacOSX.rtf \ extras/package/macosx/Info.plist.in +############################################################################### +# iOS project +############################################################################## +EXTRA_DIST += \ + extras/package/ios/build.sh + +############################################################################### +# tools (needed for contrib) +############################################################################## +EXTRA_DIST += \ + extras/tools/bootstrap \ + extras/tools/packages.mak \ + extras/tools/tools.mak ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) @@ -379,7 +409,7 @@ EXTRA_DIST += \ ############################################################################## EXTRA_DIST += \ contrib/bootstrap \ - contrib/src/ + contrib/src ############################################################################### # Building libvlc @@ -447,6 +477,8 @@ endif vlc$(EXEEXT): $(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT) +TESTS = test/run_vlc.sh + ############################################################################### # Installing plugins cache ###############################################################################