Check that .lua files are declared (faster than make distcheck)

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index abff0296584a7b31a41c6f0111ca3dc12e6eeba9..a288ea112d562080721294a8cfe8f65ddeb11d96 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,14 +1,24 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 
-nobase_dist_data_DATA = applications/vlc.desktop
+appdatadir = $(datadir)/applications/
+
+iconsdatadir = $(datadir)/icons/hicolor/
+icons16dir = $(iconsdatadir)/16x16/apps/
+icons32dir = $(iconsdatadir)/32x32/apps/
+icons48dir = $(iconsdatadir)/48x48/apps/
+icons128dir = $(iconsdatadir)/128x128/apps/
+icons256dir = $(iconsdatadir)/256x256/apps/
+
+dist_appdata_DATA = vlc.desktop
+
+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
 
-dist_vlcdata_DATA = \
-       $(DIST_icons) \
-       $(DIST_icons16) \
-       $(DIST_icons32) \
-       $(DIST_icons48) \
-       $(DIST_icons128)
 nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
        utils/audio-vlc-default.sh \
@@ -52,16 +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_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
@@ -184,18 +184,24 @@ DIST_osdmenu_default = \
 #
 # LUA
 #
-vlcluadir = $(vlclibdir)/lua
-
 luac_verbose = $(luac_verbose_$(V))
 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 $@ $<
 
 if BUILD_LUA
-vlclua_DATA = \
+nobase_vlclib_DATA = \
        lua/intf/rc.luac \
        lua/intf/hotkeys.luac \
        lua/intf/modules/common.luac \
@@ -224,15 +230,19 @@ vlclua_DATA = \
        lua/playlist/vimeo.luac \
        lua/playlist/youtube.luac \
        lua/playlist/youtube_homepage.luac \
+       lua/sd/fmc.luac \
+       lua/sd/freebox.luac \
+       lua/sd/frenchtv.luac \
+       lua/sd/icecast.luac \
        $(NULL)
 if BUILD_HTTPD
-vlclua_DATA += \
+nobase_vlclib_DATA += \
        lua/intf/http.luac \
        $(NULL)
 nobase_vlcdata_DATA += $(DIST_http_lua)
 endif
 endif
-MOSTLYCLEANFILES += $(vlclua_DATA)
+MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 
 EXTRA_DIST += \
        lua/README.txt \
@@ -270,7 +280,12 @@ EXTRA_DIST += \
        lua/intf/dummy.lua \
        lua/intf/dumpmeta.lua \
        lua/modules/sandbox.lua \
-       lua/modules/simplexml.lua
+       lua/modules/simplexml.lua \
+       lua/sd/README.txt \
+       lua/sd/fmc.lua \
+       lua/sd/freebox.lua \
+       lua/sd/frenchtv.lua \
+       lua/sd/icecast.lua
 
 DIST_http_lua = \
        lua/http/.hosts \