LUA: hide EINTR from scripts and remove the timeout feature

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index fe61d4b83dc0d9e3f020a16202dd0bcf02b26a42..4e63432f5aff7dd79fd878aa5b5be0e4abbd6a4f 100644 (file)
--- 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 = \
@@ -34,7 +34,6 @@ EXTRA_DIST = \
        $(DIST_http_lua) \
        $(DIST_lua) \
        $(DIST_osdmenu_default) \
-       $(DIST_mozilla) \
        $(DIST_maemo) \
        $(DIST_solid)
 
@@ -50,10 +49,6 @@ 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 +59,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 \
@@ -242,10 +236,10 @@ 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/rockbox_fm_presets.luac \
-       lua/playlist/vimeo.luac \
        lua/playlist/youtube.luac \
        lua/playlist/youtube_homepage.luac \
        lua/sd/appletrailers.luac \
@@ -254,6 +248,7 @@ nobase_vlclib_DATA = \
        lua/sd/frenchtv.luac \
        lua/sd/icecast.luac \
        lua/sd/jamendo.luac \
+    lua/sd/metachannels.luac \
        $(NULL)
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
@@ -308,10 +303,10 @@ 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/rockbox_fm_presets.lua \
-       lua/playlist/vimeo.lua \
        lua/playlist/youtube.lua \
        lua/playlist/youtube_homepage.lua \
        lua/sd/README.txt \
@@ -320,7 +315,8 @@ EXTRA_DIST += \
        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 \
@@ -389,20 +385,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 \
@@ -415,7 +397,7 @@ DIST_maemo = \
        maemo/next.png
 
 maemo_FILES = \
-       vlc32x32.png
+       icons/32x32/vlc.png
 
 DIST_solid = \
        solid/vlc-opencda.desktop \