Add name and duration to enqueue and play

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 457002196a71d518702d30fad8172fef6f9bfaf4..2659dfdb15567466c2ae01404265ed4e803f94bf 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -42,30 +42,17 @@ EXTRA_DIST += \
        $(DIST_skins2) \
        $(DIST_icons) \
        $(DIST_http_lua) \
-       $(DIST_lua) \
-       osdmenu/default.cfg.in \
-       $(DIST_osdmenu_default) \
        $(DIST_solid)
-CLEANFILES += osdmenu/default.cfg
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_OSDMENU
-nobase_vlcdata_DATA += \
-       osdmenu/default.cfg \
-       $(DIST_osdmenu_default)
-endif
 if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
 endif
 
-osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status
-       $(AM_V_GEN)mkdir -p osdmenu; \
-                  sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@
-
 DIST_icons = \
        vlc512x512.png
 
@@ -94,35 +81,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
                LC_ALL=C sort -z | \
                tar cvv --exclude .svn --no-recursion --null -T -) | \
        gzip -n > skins2/default.vlt
-DIST_osdmenu_default = \
-       osdmenu/default/unselected.png \
-       osdmenu/default/selection/bw.png \
-       osdmenu/default/selection/esc.png \
-       osdmenu/default/selection/fw.png \
-       osdmenu/default/selection/volume.png \
-       osdmenu/default/selection/next.png \
-       osdmenu/default/selection/play_pause.png \
-       osdmenu/default/selection/previous.png \
-       osdmenu/default/selection/stop.png \
-       osdmenu/default/selected/bw.png \
-       osdmenu/default/selected/next.png \
-       osdmenu/default/selected/play_pause.png \
-       osdmenu/default/selected/fw.png \
-       osdmenu/default/selected/stop.png \
-       osdmenu/default/selected/previous.png \
-       osdmenu/default/selected/esc.png \
-       osdmenu/default/selected/volume.png \
-       osdmenu/default/volume/volume_00.png \
-       osdmenu/default/volume/volume_01.png \
-       osdmenu/default/volume/volume_02.png \
-       osdmenu/default/volume/volume_03.png \
-       osdmenu/default/volume/volume_04.png \
-       osdmenu/default/volume/volume_05.png \
-       osdmenu/default/volume/volume_06.png \
-       osdmenu/default/volume/volume_07.png \
-       osdmenu/default/volume/volume_08.png \
-       osdmenu/default/volume/volume_09.png \
-       osdmenu/default/volume/volume_10.png
 
 #
 # LUA
@@ -145,6 +103,7 @@ luac_verbose_0 = @echo "  LUAC   $@";
 
 if BUILD_LUA
 nobase_vlclib_DATA = \
+       lua/extensions/VLSub.luac \
        lua/intf/cli.luac \
        lua/intf/dummy.luac \
        lua/intf/dumpmeta.luac \
@@ -177,6 +136,7 @@ nobase_vlclib_DATA = \
        lua/playlist/katsomo.luac \
        lua/playlist/koreus.luac \
        lua/playlist/lelombrik.luac \
+       lua/playlist/liveleak.luac \
        lua/playlist/metacafe.luac \
        lua/playlist/metachannels.luac \
        lua/playlist/mpora.luac \
@@ -189,7 +149,6 @@ nobase_vlclib_DATA = \
        lua/playlist/youtube_homepage.luac \
        lua/playlist/zapiks.luac \
        lua/sd/fmc.luac \
-       lua/sd/freebox.luac \
        lua/sd/icecast.luac \
        lua/sd/jamendo.luac \
        lua/sd/metachannels.luac \
@@ -227,6 +186,7 @@ MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 EXTRA_DIST += \
        lua/README.txt \
        lua/extensions/README.txt \
+       lua/extensions/VLSub.lua \
        lua/intf/README.txt \
        lua/intf/cli.lua \
        lua/intf/dummy.lua \
@@ -266,6 +226,7 @@ EXTRA_DIST += \
        lua/playlist/katsomo.lua \
        lua/playlist/koreus.lua \
        lua/playlist/lelombrik.lua \
+       lua/playlist/liveleak.lua \
        lua/playlist/metacafe.lua \
        lua/playlist/metachannels.lua \
        lua/playlist/mpora.lua \
@@ -279,7 +240,6 @@ EXTRA_DIST += \
        lua/playlist/zapiks.lua \
        lua/sd/README.txt \
        lua/sd/fmc.lua \
-       lua/sd/freebox.lua \
        lua/sd/icecast.lua \
        lua/sd/jamendo.lua \
        lua/sd/metachannels.lua
@@ -394,6 +354,7 @@ DIST_http_lua = \
        lua/http/old/style.css
 
 DIST_solid = \
+       solid/vlc-openbd.desktop \
        solid/vlc-opencda.desktop \
        solid/vlc-opendvd.desktop \
        solid/vlc-openvcd.desktop