X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=0b8af945205f9c6d9393e2850537d32a0b5d1894;hb=81f37f32669e78e63100940646d8a719bddff856;hp=071df43e4120556e9146a319df4bea626eaae969;hpb=6b9c7f2a35eb8e379e427a03110d9039d7ee756a;p=vlc diff --git a/share/Makefile.am b/share/Makefile.am index 071df43e41..0b8af94520 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -15,9 +15,9 @@ dist_appdata_DATA = vlc.desktop 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 + icons/32x32/vlc-xmas.xpm +dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-xmas.png +dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-xmas.png dist_icons256_DATA = icons/256x256/vlc.png nobase_dist_vlcdata_SCRIPTS = \ @@ -30,11 +30,9 @@ EXTRA_DIST = \ $(skins2_default_vlt_FILES) \ $(DIST_rsrc) \ $(DIST_skins2) \ - $(DIST_http) \ $(DIST_http_lua) \ $(DIST_lua) \ $(DIST_osdmenu_default) \ - $(DIST_mozilla) \ $(DIST_maemo) \ $(DIST_solid) @@ -43,17 +41,10 @@ if BUILD_SKINS nobase_vlcdata_DATA += skins2/default.vlt nobase_vlcdata_DATA += $(DIST_skins2) endif -if BUILD_HTTPD -nobase_vlcdata_DATA += $(DIST_http) -endif if BUILD_OSDMENU nobase_vlcdata_DATA += \ $(DIST_osdmenu_default) endif -if BUILD_MOZILLA -# TODO: move to the mozilla directory -nobase_vlcdata_DATA += $(DIST_mozilla) -endif if BUILD_HILDON nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES) endif @@ -64,8 +55,7 @@ endif DIST_rsrc = \ newres.h \ resource.h \ - vlc_wince_rc.rc \ - vlc_beos.rsrc + vlc_wince_rc.rc DIST_skins2 = \ skins2/fonts/FreeSans.ttf \ @@ -75,7 +65,7 @@ DIST_skins2 = \ skins2/winamp2.xml skins2_default_vlt_FILES = \ - skins2/default/theme.xml \ + skins2/default/theme.xml \ skins2/default/subX/about.png \ skins2/default/subX/eq.png \ skins2/default/subX/font.otf \ @@ -88,73 +78,10 @@ skins2_default_vlt_FILES = \ skins2/default.vlt: $(skins2_default_vlt_FILES) mkdir -p skins2 - tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/ - -DIST_http = \ - http/.hosts \ - http/dialogs/.hosts \ - http/dialogs/browse \ - http/dialogs/footer \ - http/dialogs/input \ - http/dialogs/main \ - http/dialogs/mosaic \ - http/dialogs/playlist \ - http/dialogs/sout \ - http/dialogs/vlm \ - http/favicon.ico \ - http/images/delete.png \ - http/images/delete_small.png \ - http/images/eject.png \ - http/images/empty.png \ - http/images/fullscreen.png \ - http/images/help.png \ - http/images/info.png \ - http/images/loop.png \ - http/images/minus.png \ - http/images/next.png \ - http/images/pause.png \ - http/images/play.png \ - http/images/playlist.png \ - http/images/playlist_small.png \ - http/images/plus.png \ - http/images/prev.png \ - http/images/refresh.png \ - http/images/repeat.png \ - http/images/sd.png \ - http/images/shuffle.png \ - http/images/slider_bar.png \ - http/images/slider_left.png \ - http/images/slider_point.png \ - http/images/slider_right.png \ - http/images/snapshot.png \ - http/images/slow.png \ - http/images/sort.png \ - http/images/sout.png \ - http/images/speaker.png \ - http/images/speaker_mute.png \ - http/images/stop.png \ - http/images/vlc16x16.png \ - http/images/volume_down.png \ - http/images/volume_up.png \ - http/images/white.png \ - http/images/white_cross_small.png \ - http/index.html \ - http/js/functions.js \ - http/js/mosaic.js \ - http/js/vlm.js \ - http/mosaic.html \ - http/requests/browse.xml \ - http/requests/playlist.xml \ - http/requests/status.xml \ - http/requests/vlm.xml \ - http/requests/vlm_cmd.xml \ - http/requests/README.txt \ - http/style.css \ - http/iehacks.css \ - http/vlm.html \ - http/vlm_export.html \ - http/flash.html - + (cd "$(srcdir)/skins2"; find default -print0 | \ + LC_ALL=C sort -z | \ + tar cvv --exclude .svn --no-recursion --null -T -) | \ + gzip -n > skins2/default.vlt DIST_osdmenu_default = \ osdmenu/default.cfg \ osdmenu/default/unselected.png \ @@ -208,14 +135,13 @@ luac_verbose_0 = @echo " LUAC $@"; if BUILD_LUA nobase_vlclib_DATA = \ lua/extensions/allocine-fr.luac \ - lua/extensions/imdb.luac \ + lua/intf/cli.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/meta/art/04_musicbrainz.luac \ lua/meta/art/02_frenchtv.luac \ @@ -242,17 +168,18 @@ nobase_vlclib_DATA = \ lua/playlist/lelombrik.luac \ lua/playlist/megavideo.luac \ lua/playlist/metacafe.luac \ + lua/playlist/metachannels.luac \ lua/playlist/mpora.luac \ lua/playlist/pinkbike.luac \ + lua/playlist/pluzz.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 \ lua/sd/icecast.luac \ lua/sd/jamendo.luac \ + lua/sd/metachannels.luac \ $(NULL) if BUILD_HTTPD nobase_vlclib_DATA += \ @@ -267,8 +194,8 @@ EXTRA_DIST += \ lua/README.txt \ lua/extensions/README.txt \ lua/extensions/allocine-fr.lua \ - lua/extensions/imdb.lua \ lua/intf/README.txt \ + lua/intf/cli.lua \ lua/intf/dummy.lua \ lua/intf/dumpmeta.lua \ lua/intf/hotkeys.lua \ @@ -276,7 +203,6 @@ EXTRA_DIST += \ 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/04_musicbrainz.lua \ @@ -307,18 +233,19 @@ EXTRA_DIST += \ lua/playlist/lelombrik.lua \ lua/playlist/megavideo.lua \ lua/playlist/metacafe.lua \ + lua/playlist/metachannels.lua \ lua/playlist/mpora.lua \ lua/playlist/pinkbike.lua \ + lua/playlist/pluzz.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 \ lua/sd/icecast.lua \ - lua/sd/jamendo.lua + lua/sd/jamendo.lua \ + lua/sd/metachannels.lua DIST_http_lua = \ lua/http/.hosts \ @@ -387,20 +314,6 @@ DIST_http_lua = \ lua/http/vlm_export.html \ lua/http/flash.html -DIST_mozilla = \ - mozilla/fullscreen.xpm \ - mozilla/pause.xpm \ - mozilla/play.xpm \ - mozilla/skip_next.xpm \ - mozilla/skip_previous.xpm \ - mozilla/stop.xpm \ - mozilla/time_icon.xpm \ - mozilla/time_line.xpm \ - mozilla/volume_knob.xpm \ - mozilla/volume_max.xpm \ - mozilla/volume_mute.xpm \ - mozilla/volume_slider_bar.xpm - DIST_maemo = \ maemo/vlc_intf.rc \ maemo/vlc_left_tab_active.png \ @@ -413,7 +326,7 @@ DIST_maemo = \ maemo/next.png maemo_FILES = \ - vlc32x32.png + icons/32x32/vlc.png DIST_solid = \ solid/vlc-opencda.desktop \