X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=071df43e4120556e9146a319df4bea626eaae969;hb=1ce4f166a9653d8ee369862ee3111cce91af815d;hp=59d424f1992c315ef95965a238eabda7d64bccf8;hpb=892f767975242d1962ee500aa9af1bf3880387fa;p=vlc diff --git a/share/Makefile.am b/share/Makefile.am index 59d424f199..071df43e41 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -12,12 +12,13 @@ icons256dir = $(iconsdatadir)/256x256/apps/ dist_appdata_DATA = vlc.desktop -dist_vlcdata_DATA = vlc.ico -dist_icons16_DATA = vlc16x16.png vlc16x16.xpm -dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm -dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png -dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png -dist_icons256_DATA = vlc256x256.png +dist_vlcdata_DATA = icons/vlc.ico +dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm +dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \ + icons/32x32/vlc-christmas.xpm +dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png +dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png +dist_icons256_DATA = icons/256x256/vlc.png nobase_dist_vlcdata_SCRIPTS = \ utils/gnome-vlc-default.sh \ @@ -87,7 +88,7 @@ skins2_default_vlt_FILES = \ skins2/default.vlt: $(skins2_default_vlt_FILES) mkdir -p skins2 - tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/ + tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/ DIST_http = \ http/.hosts \ @@ -147,7 +148,7 @@ DIST_http = \ http/requests/status.xml \ http/requests/vlm.xml \ http/requests/vlm_cmd.xml \ - http/requests/readme \ + http/requests/README.txt \ http/style.css \ http/iehacks.css \ http/vlm.html \ @@ -206,24 +207,30 @@ luac_verbose_0 = @echo " LUAC $@"; if BUILD_LUA nobase_vlclib_DATA = \ - lua/intf/luac.luac \ - lua/intf/rc.luac \ + lua/extensions/allocine-fr.luac \ + lua/extensions/imdb.luac \ + lua/intf/dummy.luac \ + lua/intf/dumpmeta.luac \ lua/intf/hotkeys.luac \ + lua/intf/luac.luac \ lua/intf/modules/common.luac \ lua/intf/modules/host.luac \ + lua/intf/rc.luac \ lua/intf/telnet.luac \ - lua/intf/dummy.luac \ - lua/intf/dumpmeta.luac \ - lua/meta/art/01_musicbrainz.luac \ + lua/meta/art/04_musicbrainz.luac \ lua/meta/art/02_frenchtv.luac \ - lua/meta/art/10_googleimage.luac \ + lua/meta/art/03_lastfm.luac \ + lua/meta/art/01_googleimage.luac \ lua/meta/fetcher/tvrage.luac \ lua/meta/reader/filename.luac \ lua/modules/sandbox.luac \ lua/modules/simplexml.luac \ lua/playlist/anevia_streams.luac \ + lua/playlist/anevia_xml.luac \ lua/playlist/appletrailers.luac \ + lua/playlist/bbc_co_uk.luac \ lua/playlist/break.luac \ + lua/playlist/canalplus.luac \ lua/playlist/cue.luac \ lua/playlist/dailymotion.luac \ lua/playlist/france2.luac \ @@ -231,13 +238,16 @@ nobase_vlclib_DATA = \ lua/playlist/jamendo.luac \ lua/playlist/joox.luac \ lua/playlist/katsomo.luac \ + lua/playlist/koreus.luac \ lua/playlist/lelombrik.luac \ lua/playlist/megavideo.luac \ lua/playlist/metacafe.luac \ lua/playlist/mpora.luac \ - lua/playlist/vimeo.luac \ + lua/playlist/pinkbike.luac \ + lua/playlist/rockbox_fm_presets.luac \ lua/playlist/youtube.luac \ lua/playlist/youtube_homepage.luac \ + lua/sd/appletrailers.luac \ lua/sd/fmc.luac \ lua/sd/freebox.luac \ lua/sd/frenchtv.luac \ @@ -255,45 +265,55 @@ MOSTLYCLEANFILES += $(nobase_vlclib_DATA) EXTRA_DIST += \ lua/README.txt \ + lua/extensions/README.txt \ + lua/extensions/allocine-fr.lua \ + lua/extensions/imdb.lua \ + lua/intf/README.txt \ + lua/intf/dummy.lua \ + lua/intf/dumpmeta.lua \ + lua/intf/hotkeys.lua \ + lua/intf/http.lua \ + lua/intf/luac.lua \ + lua/intf/modules/common.lua \ + lua/intf/modules/host.lua \ + lua/intf/rc.lua \ + lua/intf/telnet.lua \ lua/meta/art/README.txt \ - lua/meta/art/01_musicbrainz.lua \ + lua/meta/art/04_musicbrainz.lua \ lua/meta/art/02_frenchtv.lua \ - lua/meta/art/10_googleimage.lua \ + lua/meta/art/03_lastfm.lua \ + lua/meta/art/01_googleimage.lua \ lua/meta/fetcher/README.txt \ lua/meta/fetcher/tvrage.lua \ lua/meta/reader/README.txt \ lua/meta/reader/filename.lua \ + lua/modules/sandbox.lua \ + lua/modules/simplexml.lua \ lua/playlist/README.txt \ lua/playlist/anevia_streams.lua \ + lua/playlist/anevia_xml.lua \ lua/playlist/appletrailers.lua \ + lua/playlist/bbc_co_uk.lua \ lua/playlist/break.lua \ + lua/playlist/canalplus.lua \ lua/playlist/cue.lua \ lua/playlist/dailymotion.lua \ lua/playlist/france2.lua \ + lua/playlist/googlevideo.lua \ lua/playlist/jamendo.lua \ lua/playlist/joox.lua \ lua/playlist/katsomo.lua \ + lua/playlist/koreus.lua \ lua/playlist/lelombrik.lua \ - lua/playlist/youtube.lua \ - lua/playlist/youtube_homepage.lua \ lua/playlist/megavideo.lua \ lua/playlist/metacafe.lua \ - lua/playlist/googlevideo.lua \ lua/playlist/mpora.lua \ - lua/playlist/vimeo.lua \ - lua/intf/README.txt \ - lua/intf/http.lua \ - lua/intf/rc.lua \ - lua/intf/luac.lua \ - lua/intf/hotkeys.lua \ - lua/intf/modules/common.lua \ - lua/intf/modules/host.lua \ - lua/intf/telnet.lua \ - lua/intf/dummy.lua \ - lua/intf/dumpmeta.lua \ - lua/modules/sandbox.lua \ - lua/modules/simplexml.lua \ + lua/playlist/pinkbike.lua \ + lua/playlist/rockbox_fm_presets.lua \ + lua/playlist/youtube.lua \ + lua/playlist/youtube_homepage.lua \ lua/sd/README.txt \ + lua/sd/appletrailers.lua \ lua/sd/fmc.lua \ lua/sd/freebox.lua \ lua/sd/frenchtv.lua \ @@ -360,7 +380,7 @@ DIST_http_lua = \ lua/http/requests/status.xml \ lua/http/requests/vlm.xml \ lua/http/requests/vlm_cmd.xml \ - lua/http/requests/readme \ + lua/http/requests/README.txt \ lua/http/style.css \ lua/http/iehacks.css \ lua/http/vlm.html \