Lua SD: Jamendo - using album_image will give better results than album_id

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 746a391ecf7db7706e987723c5ea6eba5a39fd9b..8d989d64bbb1fc46a2ced95e76a6b0c861f500ca 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,6 +1,8 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 
+appdatadir = $(datadir)/applications/
+
 iconsdatadir = $(datadir)/icons/hicolor/
 icons16dir = $(iconsdatadir)/16x16/apps/
 icons32dir = $(iconsdatadir)/32x32/apps/
@@ -8,14 +10,14 @@ icons48dir = $(iconsdatadir)/48x48/apps/
 icons128dir = $(iconsdatadir)/128x128/apps/
 icons256dir = $(iconsdatadir)/256x256/apps/
 
-nobase_dist_data_DATA = applications/vlc.desktop
+dist_appdata_DATA = vlc.desktop
 
-dist_vlcdata_DATA = $(DIST_icons)
-dist_icons16_DATA = $(DIST_icons16)
-dist_icons32_DATA = $(DIST_icons32)
-dist_icons48_DATA = $(DIST_icons48)
-dist_icons128_DATA = $(DIST_icons128)
-dist_icons256_DATA = $(DIST_icons256)
+dist_vlcdata_DATA = vlc.ico
+dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
+dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
+dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
+dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
+dist_icons256_DATA = vlc256x256.png
 
 nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
@@ -60,18 +62,6 @@ DIST_rsrc = \
        vlc_wince_rc.rc \
        vlc_beos.rsrc
 
-DIST_icons = vlc.ico
-
-DIST_icons16 = vlc16x16.png vlc16x16.xpm
-
-DIST_icons32 = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
-
-DIST_icons48 = vlc48x48.png vlc48x48-christmas.png
-
-DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
-
-DIST_icons256 = vlc256x256.png
-
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
@@ -199,6 +189,14 @@ luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY))
 luac_verbose_0 = @echo "  LUAC   $@";
 
 .lua.luac:
+       $(AM_V_at)for f in $(EXTRA_DIST); do \
+               test "$(srcdir)" = . || f="$(srcdir)/$$f"; \
+               if test $$f = $<; then \
+                       exit 0; \
+               fi; \
+       done; \
+       echo "Attempt to byte-compile unknown file: $(<)!"; \
+       exit 1
        $(AM_V_at)mkdir -p "$$(dirname '$@')"
        $(luac_verbose)$(LUAC) -o $@ $<
 
@@ -217,12 +215,15 @@ nobase_vlclib_DATA = \
        lua/meta/fetcher/tvrage.luac \
        lua/meta/reader/filename.luac \
        lua/modules/sandbox.luac \
+       lua/modules/simplexml.luac \
        lua/playlist/anevia_streams.luac \
        lua/playlist/appletrailers.luac \
        lua/playlist/break.luac \
+       lua/playlist/cue.luac \
        lua/playlist/dailymotion.luac \
        lua/playlist/france2.luac \
        lua/playlist/googlevideo.luac \
+       lua/playlist/jamendo.luac \
        lua/playlist/joox.luac \
        lua/playlist/katsomo.luac \
        lua/playlist/lelombrik.luac \
@@ -236,6 +237,7 @@ nobase_vlclib_DATA = \
        lua/sd/freebox.luac \
        lua/sd/frenchtv.luac \
        lua/sd/icecast.luac \
+       lua/sd/jamendo.luac \
        $(NULL)
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
@@ -244,7 +246,7 @@ nobase_vlclib_DATA += \
 nobase_vlcdata_DATA += $(DIST_http_lua)
 endif
 endif
-MOSTLYCLEANFILES += $(vlclua_DATA)
+MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 
 EXTRA_DIST += \
        lua/README.txt \
@@ -260,8 +262,10 @@ EXTRA_DIST += \
        lua/playlist/anevia_streams.lua \
        lua/playlist/appletrailers.lua \
        lua/playlist/break.lua \
+       lua/playlist/cue.lua \
        lua/playlist/dailymotion.lua \
        lua/playlist/france2.lua \
+       lua/playlist/jamendo.lua \
        lua/playlist/joox.lua \
        lua/playlist/katsomo.lua \
        lua/playlist/lelombrik.lua \
@@ -287,7 +291,8 @@ EXTRA_DIST += \
        lua/sd/fmc.lua \
        lua/sd/freebox.lua \
        lua/sd/frenchtv.lua \
-       lua/sd/icecast.lua
+       lua/sd/icecast.lua \
+       lua/sd/jamendo.lua
 
 DIST_http_lua = \
        lua/http/.hosts \