lua sd: add source as meta for faster skipping of unrelated resources

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index f030edaf3e25a23c077f9d50a3dd1db5d550e0b4..83ca797542a7618509e2319a72e2e1e6a013b5e2 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,17 +1,30 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
+EXTRA_DIST =
 
-appdatadir = $(datadir)/applications/
+appdatadir = $(datadir)/applications
+if !HAVE_WIN32
+if !HAVE_WINCE
+appdata_DATA = vlc.desktop
+endif
+endif
+EXTRA_DIST += vlc.desktop.in
+CLEANFILES += $(appdata_DATA)
 
-iconsdatadir = $(datadir)/icons/hicolor/
-icons16dir = $(iconsdatadir)/16x16/apps/
-icons32dir = $(iconsdatadir)/32x32/apps/
-icons48dir = $(iconsdatadir)/48x48/apps/
-icons128dir = $(iconsdatadir)/128x128/apps/
-icons256dir = $(iconsdatadir)/256x256/apps/
+vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
+       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+       $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+       $(AM_V_at)mv -f tmp-$@ $@
 
-dist_appdata_DATA = vlc.desktop
+iconsdatadir = $(datadir)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+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 \
@@ -25,16 +38,21 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
+endif
+endif
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
        $(DIST_rsrc) \
        $(DIST_skins2) \
+       $(DIST_icons) \
        $(DIST_http_lua) \
        $(DIST_lua) \
+       osdmenu/default.cfg.in \
        $(DIST_osdmenu_default) \
        $(DIST_maemo) \
        $(DIST_solid)
+CLEANFILES += osdmenu/default.cfg
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
@@ -43,6 +61,7 @@ nobase_vlcdata_DATA += $(DIST_skins2)
 endif
 if BUILD_OSDMENU
 nobase_vlcdata_DATA += \
+       osdmenu/default.cfg \
        $(DIST_osdmenu_default)
 endif
 if BUILD_HILDON
@@ -52,11 +71,19 @@ 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_rsrc = \
        newres.h \
        resource.h \
        vlc_wince_rc.rc
 
+DIST_icons = \
+       vlc48x48.ico \
+       vlc512x512.png
+
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
@@ -83,7 +110,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
                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 \
@@ -134,21 +160,20 @@ luac_verbose_0 = @echo "  LUAC   $@";
 
 if BUILD_LUA
 nobase_vlclib_DATA = \
-       lua/extensions/allocine-fr.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/dkjson.luac \
        lua/modules/sandbox.luac \
        lua/modules/simplexml.luac \
        lua/playlist/anevia_streams.luac \
@@ -159,6 +184,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 \
@@ -166,15 +192,17 @@ nobase_vlclib_DATA = \
        lua/playlist/katsomo.luac \
        lua/playlist/koreus.luac \
        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/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 \
@@ -194,12 +222,10 @@ MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 EXTRA_DIST += \
        lua/README.txt \
        lua/extensions/README.txt \
-       lua/extensions/allocine-fr.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 \
@@ -207,14 +233,15 @@ EXTRA_DIST += \
        lua/intf/modules/httprequests.lua \
        lua/intf/telnet.lua \
        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/dkjson.lua \
        lua/modules/sandbox.lua \
        lua/modules/simplexml.lua \
        lua/playlist/README.txt \
@@ -226,6 +253,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 \
@@ -233,15 +261,17 @@ EXTRA_DIST += \
        lua/playlist/katsomo.lua \
        lua/playlist/koreus.lua \
        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/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 \
@@ -258,7 +288,6 @@ 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 \
@@ -321,12 +350,12 @@ DIST_http_lua = \
        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 \
        lua/http/requests/playlist_jstree.xml \
        lua/http/requests/browse.xml \
+       lua/http/requests/browse.json \
        lua/http/requests/vlm_cmd.xml \
        lua/http/requests/status.xml \
        lua/http/requests/status.json \
@@ -348,6 +377,7 @@ 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/css/mobile.css \
        lua/http/js/jquery-1.5.1.min.js \
        lua/http/old/js/functions.js \
        lua/http/old/js/vlm.js \