]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
mediacodec: handle error_state in one place
[vlc] / share / Makefile.am
index b08bc8302bd904568dcdb5138907f76acb283bf4..8c7c36c9ac9114b7de4fbc79a1dbba8b6127e38f 100644 (file)
@@ -4,10 +4,8 @@ EXTRA_DIST =
 
 appdatadir = $(datadir)/applications
 if !HAVE_WIN32
-if !HAVE_WINCE
 appdata_DATA = vlc.desktop
 endif
-endif
 EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
@@ -24,7 +22,6 @@ icons128dir = $(iconsdatadir)/128x128/apps
 icons256dir = $(iconsdatadir)/256x256/apps
 
 if !HAVE_WIN32
-if !HAVE_WINCE
 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 \
@@ -39,16 +36,12 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/video-vlc-default.sh \
        $(NULL)
 endif
-endif
 
 EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
-       $(DIST_rsrc) \
        $(DIST_skins2) \
+       $(DIST_icons) \
        $(DIST_http_lua) \
-       $(DIST_lua) \
-       $(DIST_osdmenu_default) \
-       $(DIST_maemo) \
        $(DIST_solid)
 
 nobase_vlcdata_DATA =
@@ -56,21 +49,12 @@ if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_OSDMENU
-nobase_vlcdata_DATA += \
-       $(DIST_osdmenu_default)
-endif
-if BUILD_HILDON
-nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
-endif
 if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
 endif
 
-DIST_rsrc = \
-       newres.h \
-       resource.h \
-       vlc_wince_rc.rc
+DIST_icons = \
+       vlc512x512.png
 
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
@@ -80,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 \
@@ -97,36 +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.cfg \
-       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
@@ -149,21 +103,20 @@ luac_verbose_0 = @echo "  LUAC   $@";
 
 if BUILD_LUA
 nobase_vlclib_DATA = \
-       lua/extensions/allocine-fr.luac \
+       lua/extensions/VLSub.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/telnet.luac \
-       lua/meta/art/04_musicbrainz.luac \
        lua/meta/art/02_frenchtv.luac \
        lua/meta/art/03_lastfm.luac \
        lua/meta/art/01_googleimage.luac \
+       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 \
@@ -175,6 +128,7 @@ nobase_vlclib_DATA = \
        lua/playlist/canalplus.luac \
        lua/playlist/cue.luac \
        lua/playlist/dailymotion.luac \
+       lua/playlist/extreme.luac \
        lua/playlist/france2.luac \
        lua/playlist/googlevideo.luac \
        lua/playlist/jamendo.luac \
@@ -182,28 +136,52 @@ nobase_vlclib_DATA = \
        lua/playlist/katsomo.luac \
        lua/playlist/koreus.luac \
        lua/playlist/lelombrik.luac \
-       lua/playlist/megavideo.luac \
+       lua/playlist/liveleak.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/soundcloud.luac \
        lua/playlist/vimeo.luac \
        lua/playlist/youtube.luac \
        lua/playlist/youtube_homepage.luac \
+       lua/playlist/zapiks.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)
+
+nobase_doc_DATA = \
+       lua/README.txt \
+       lua/extensions/README.txt \
+       lua/intf/README.txt \
+       lua/intf/dumpmeta.lua \
+       lua/meta/README.txt \
+       lua/meta/art/README.txt \
+       lua/meta/art/01_googleimage.lua \
+       lua/meta/fetcher/README.txt \
+       lua/meta/fetcher/tvrage.lua \
+       lua/meta/reader/README.txt \
+       lua/meta/reader/filename.lua \
+       lua/playlist/README.txt \
+       lua/playlist/soundcloud.lua \
+       lua/playlist/youtube.lua \
+       lua/sd/README.txt \
+       lua/sd/icecast.lua \
+       lua/sd/icast.lua \
+       $(NULL)
+
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
        lua/intf/http.luac \
        lua/intf/modules/httprequests.luac \
        $(NULL)
 nobase_vlcdata_DATA += $(DIST_http_lua)
+nobase_doc_DATA += lua/http/requests/README.txt
 endif
 endif
 MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
@@ -211,27 +189,27 @@ MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 EXTRA_DIST += \
        lua/README.txt \
        lua/extensions/README.txt \
-       lua/extensions/allocine-fr.lua \
+       lua/extensions/VLSub.lua \
        lua/intf/README.txt \
        lua/intf/cli.lua \
        lua/intf/dummy.lua \
        lua/intf/dumpmeta.lua \
-       lua/intf/hotkeys.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 \
+       lua/meta/README.txt \
        lua/meta/art/README.txt \
-       lua/meta/art/04_musicbrainz.lua \
        lua/meta/art/02_frenchtv.lua \
        lua/meta/art/03_lastfm.lua \
        lua/meta/art/01_googleimage.lua \
+       lua/meta/art/00_musicbrainz.lua \
        lua/meta/fetcher/README.txt \
        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 \
@@ -244,6 +222,7 @@ EXTRA_DIST += \
        lua/playlist/canalplus.lua \
        lua/playlist/cue.lua \
        lua/playlist/dailymotion.lua \
+       lua/playlist/extreme.lua \
        lua/playlist/france2.lua \
        lua/playlist/googlevideo.lua \
        lua/playlist/jamendo.lua \
@@ -251,20 +230,22 @@ EXTRA_DIST += \
        lua/playlist/katsomo.lua \
        lua/playlist/koreus.lua \
        lua/playlist/lelombrik.lua \
-       lua/playlist/megavideo.lua \
+       lua/playlist/liveleak.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/soundcloud.lua \
        lua/playlist/vimeo.lua \
        lua/playlist/youtube.lua \
        lua/playlist/youtube_homepage.lua \
+       lua/playlist/zapiks.lua \
        lua/sd/README.txt \
        lua/sd/fmc.lua \
-       lua/sd/freebox.lua \
        lua/sd/icecast.lua \
+       lua/sd/icast.lua \
        lua/sd/jamendo.lua \
        lua/sd/metachannels.lua
 
@@ -277,70 +258,25 @@ DIST_http_lua = \
        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/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 \
        lua/http/favicon.ico \
        lua/http/mobile_view.html \
-       lua/http/.hosts \
        lua/http/requests/playlist.xml \
        lua/http/requests/playlist.json \
        lua/http/requests/README.txt \
@@ -368,31 +304,14 @@ DIST_http_lua = \
        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/css/mobile.css \
        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 \
-       maemo/vlc_left_tab_active.png \
-       maemo/vlc_left_tab_passive.png \
-       maemo/playlist.png \
-       maemo/play.png \
-       maemo/pause.png \
-       maemo/stop.png \
-       maemo/previous.png \
-       maemo/next.png
-
-maemo_FILES = \
-       icons/32x32/vlc.png
+       lua/http/js/controllers.js
 
 DIST_solid = \
+       solid/vlc-openbd.desktop \
        solid/vlc-opencda.desktop \
        solid/vlc-opendvd.desktop \
        solid/vlc-openvcd.desktop