X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=d7b5dbdecc7ad0477cb7cb0391d304febbb43e99;hb=db387a130c25833f93e2e73351ae7611f00c197e;hp=200a9c60974b5830afc61b080cb8d80d674bd033;hpb=dbe127da3f9a5f14f21706c1e5ea91cb83cb9fc0;p=vlc diff --git a/share/Makefile.am b/share/Makefile.am index 200a9c6097..d7b5dbdecc 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -30,7 +30,6 @@ EXTRA_DIST = \ $(skins2_default_vlt_FILES) \ $(DIST_rsrc) \ $(DIST_skins2) \ - $(DIST_http) \ $(DIST_http_lua) \ $(DIST_lua) \ $(DIST_osdmenu_default) \ @@ -42,9 +41,6 @@ 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) @@ -86,72 +82,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_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 - DIST_osdmenu_default = \ osdmenu/default.cfg \ osdmenu/default/unselected.png \ @@ -241,6 +171,7 @@ nobase_vlclib_DATA = \ 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 \ @@ -253,6 +184,7 @@ nobase_vlclib_DATA = \ if BUILD_HTTPD nobase_vlclib_DATA += \ lua/intf/http.luac \ + lua/intf/modules/httprequests.luac \ $(NULL) nobase_vlcdata_DATA += $(DIST_http_lua) endif @@ -272,6 +204,7 @@ EXTRA_DIST += \ lua/intf/luac.lua \ lua/intf/modules/common.lua \ lua/intf/modules/host.lua \ + lua/intf/modules/httprequests.lua \ lua/intf/telnet.lua \ lua/meta/art/README.txt \ lua/meta/art/04_musicbrainz.lua \ @@ -305,6 +238,7 @@ EXTRA_DIST += \ 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 \ @@ -316,71 +250,112 @@ EXTRA_DIST += \ lua/sd/metachannels.lua DIST_http_lua = \ - lua/http/.hosts \ - lua/http/custom.lua \ + lua/http/view.html \ + lua/http/mobile.html \ + lua/http/dialogs/create_stream.html \ + lua/http/dialogs/equalizer_window.html \ + lua/http/dialogs/mosaic_window.html \ + lua/http/dialogs/batch_window.html \ + lua/http/dialogs/error_window.html \ + lua/http/dialogs/browse_window.html \ lua/http/dialogs/.hosts \ - lua/http/dialogs/browse \ - lua/http/dialogs/footer \ - lua/http/dialogs/input \ - lua/http/dialogs/main \ - lua/http/dialogs/mosaic \ - lua/http/dialogs/playlist \ - lua/http/dialogs/sout \ - lua/http/dialogs/vlm \ - lua/http/favicon.ico \ - lua/http/images/delete.png \ - lua/http/images/delete_small.png \ - lua/http/images/eject.png \ - lua/http/images/empty.png \ - lua/http/images/fullscreen.png \ - lua/http/images/help.png \ - lua/http/images/info.png \ - lua/http/images/loop.png \ - lua/http/images/minus.png \ - lua/http/images/next.png \ - lua/http/images/pause.png \ - lua/http/images/play.png \ - lua/http/images/playlist.png \ - lua/http/images/playlist_small.png \ - lua/http/images/plus.png \ - lua/http/images/prev.png \ - lua/http/images/refresh.png \ - lua/http/images/repeat.png \ - lua/http/images/reset.png \ - lua/http/images/sd.png \ - lua/http/images/shuffle.png \ - lua/http/images/slider_bar.png \ - lua/http/images/slider_left.png \ - lua/http/images/slider_point.png \ - lua/http/images/slider_right.png \ - lua/http/images/snapshot.png \ - lua/http/images/slow.png \ - lua/http/images/sort.png \ - lua/http/images/sout.png \ - lua/http/images/speaker.png \ - lua/http/images/speaker_mute.png \ - lua/http/images/stop.png \ + 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/images/volume_down.png \ - lua/http/images/volume_up.png \ - lua/http/images/white.png \ - lua/http/images/white_cross_small.png \ - lua/http/index.html \ - lua/http/js/functions.js \ - lua/http/js/mosaic.js \ - lua/http/js/vlm.js \ - lua/http/mosaic.html \ - lua/http/requests/browse.xml \ + 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 \ + lua/http/favicon.ico \ + lua/http/mobile_view.html \ + lua/http/.hosts \ lua/http/requests/playlist.xml \ + lua/http/requests/README.txt \ + lua/http/requests/playlist_jstree.xml \ + lua/http/requests/browse.xml \ + lua/http/requests/vlm_cmd.xml \ lua/http/requests/status.xml \ + lua/http/requests/status.json \ lua/http/requests/vlm.xml \ - lua/http/requests/vlm_cmd.xml \ - lua/http/requests/README.txt \ - lua/http/style.css \ - lua/http/iehacks.css \ - lua/http/vlm.html \ - lua/http/vlm_export.html \ - lua/http/flash.html + lua/http/index.html \ + lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \ + lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \ + lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \ + lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \ + lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \ + lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \ + lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \ + lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \ + lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \ + lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \ + lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \ + lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \ + lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \ + lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \ + lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \ + lua/http/css/main.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 DIST_maemo = \ maemo/vlc_intf.rc \