X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=105ed0cbe2030ce3916d56bde2366c7d666df1af;hb=81af7a3559a2002f2dc7b49917ca3f14d2992f4c;hp=403be9e930754006db75553dab06f795a6f233cb;hpb=2be836eba451de59cedee4e847dc39f7d7ff9b4d;p=vlc diff --git a/share/Makefile.am b/share/Makefile.am index 403be9e930..105ed0cbe2 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -42,29 +42,17 @@ EXTRA_DIST += \ $(DIST_skins2) \ $(DIST_icons) \ $(DIST_http_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 @@ -76,7 +64,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 \ @@ -93,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 @@ -144,11 +103,11 @@ 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 \ lua/intf/luac.luac \ - lua/intf/modules/common.luac \ lua/intf/modules/host.luac \ lua/intf/telnet.luac \ lua/meta/art/02_frenchtv.luac \ @@ -157,6 +116,7 @@ nobase_vlclib_DATA = \ lua/meta/art/00_musicbrainz.luac \ lua/meta/fetcher/tvrage.luac \ lua/meta/reader/filename.luac \ + lua/modules/common.luac \ lua/modules/dkjson.luac \ lua/modules/sandbox.luac \ lua/modules/simplexml.luac \ @@ -176,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 \ @@ -187,10 +148,9 @@ nobase_vlclib_DATA = \ lua/playlist/youtube.luac \ lua/playlist/youtube_homepage.luac \ lua/playlist/zapiks.luac \ - lua/sd/assembleenationale.luac \ lua/sd/fmc.luac \ - lua/sd/freebox.luac \ lua/sd/icecast.luac \ + lua/sd/icast.luac \ lua/sd/jamendo.luac \ lua/sd/metachannels.luac \ $(NULL) @@ -211,6 +171,7 @@ nobase_doc_DATA = \ lua/playlist/youtube.lua \ lua/sd/README.txt \ lua/sd/icecast.lua \ + lua/sd/icast.lua \ $(NULL) if BUILD_HTTPD @@ -227,13 +188,13 @@ 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 \ lua/intf/dumpmeta.lua \ lua/intf/http.lua \ lua/intf/luac.lua \ - lua/intf/modules/common.lua \ lua/intf/modules/host.lua \ lua/intf/modules/httprequests.lua \ lua/intf/telnet.lua \ @@ -246,6 +207,7 @@ EXTRA_DIST += \ lua/meta/fetcher/tvrage.lua \ lua/meta/reader/README.txt \ lua/meta/reader/filename.lua \ + lua/modules/common.lua \ lua/modules/dkjson.lua \ lua/modules/sandbox.lua \ lua/modules/simplexml.lua \ @@ -266,6 +228,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 \ @@ -278,10 +241,9 @@ EXTRA_DIST += \ lua/playlist/youtube_homepage.lua \ lua/playlist/zapiks.lua \ lua/sd/README.txt \ - lua/sd/assembleenationale.lua \ lua/sd/fmc.lua \ - lua/sd/freebox.lua \ lua/sd/icecast.lua \ + lua/sd/icast.lua \ lua/sd/jamendo.lua \ lua/sd/metachannels.lua @@ -297,60 +259,17 @@ DIST_http_lua = \ lua/http/dialogs/stream_window.html \ lua/http/dialogs/offset_window.html \ lua/http/dialogs/stream_config_window.html \ - lua/http/dialogs/old/browse \ - lua/http/dialogs/old/footer \ - lua/http/dialogs/old/input \ - lua/http/dialogs/old/main \ - lua/http/dialogs/old/playlist \ - lua/http/dialogs/old/sout \ - lua/http/dialogs/old/vlm \ lua/http/custom.lua \ lua/http/vlm.html \ - lua/http/old/images/loop.png \ lua/http/images/buttons.png \ lua/http/images/speaker-32.png \ - lua/http/old/images/fullscreen.png \ lua/http/images/vlc-48.png \ - lua/http/old/images/prev.png \ - lua/http/old/images/play.png \ lua/http/images/Audio-48.png \ - lua/http/old/images/empty.png \ - lua/http/old/images/minus.png \ - lua/http/old/images/slider_right.png \ - lua/http/old/images/slider_point.png \ - lua/http/old/images/pause.png \ - lua/http/old/images/speaker_mute.png \ - lua/http/old/images/delete_small.png \ - lua/http/old/images/snapshot.png \ lua/http/images/Folder-48.png \ - lua/http/old/images/info.png \ - lua/http/old/images/refresh.png \ - lua/http/old/images/sout.png \ - lua/http/old/images/sort.png \ - lua/http/old/images/white_cross_small.png \ - lua/http/old/images/shuffle.png \ lua/http/images/Other-48.png \ - lua/http/old/images/repeat.png \ - lua/http/old/images/slow.png \ - lua/http/old/images/slider_left.png \ - lua/http/old/images/help.png \ - lua/http/old/images/stop.png \ - lua/http/old/images/sd.png \ - lua/http/old/images/speaker.png \ - lua/http/old/images/delete.png \ lua/http/images/Back-48.png \ lua/http/images/Video-48.png \ - lua/http/old/images/playlist_small.png \ - lua/http/old/images/eject.png \ - lua/http/old/images/playlist.png \ - lua/http/old/images/volume_up.png \ - lua/http/old/images/next.png \ - lua/http/old/images/volume_down.png \ - lua/http/old/images/slider_bar.png \ lua/http/images/vlc16x16.png \ - lua/http/old/images/plus.png \ - lua/http/old/images/white.png \ - lua/http/old/images/reset.png \ lua/http/mobile_equalizer.html \ lua/http/vlm_export.html \ lua/http/mobile_browse.html \ @@ -384,15 +303,10 @@ DIST_http_lua = \ lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \ lua/http/css/main.css \ lua/http/css/mobile.css \ - lua/http/js/jquery-1.5.1.min.js \ - lua/http/old/js/functions.js \ - lua/http/old/js/vlm.js \ lua/http/js/ui.js \ lua/http/js/common.js \ lua/http/js/jquery.jstree.js \ - lua/http/js/controlers.js \ - lua/http/js/jquery-ui-1.8.13.custom.min.js \ - lua/http/old/style.css + lua/http/js/controllers.js DIST_solid = \ solid/vlc-openbd.desktop \