X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=1fafd3bd903ffb9955c3f58a8c8ebfcf83fd98b0;hb=ac07c98252cdcbacf3340f2b5522f808169331dd;hp=66c060aafc5e5753cea6dad5ae15c42bc89b9e5d;hpb=647ea7baec3260e3ca3b081c34e945063ed6afb0;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index 66c060aafc..1fafd3bd90 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = \
 	$(DIST_lua) \
 	$(DIST_osdmenu_default) \
 	$(DIST_mozilla) \
-	$(DIST_maemo)
+	$(DIST_maemo) \
+	$(DIST_solid)
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
@@ -55,6 +56,9 @@ endif
 if BUILD_HILDON
 nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif
+if KDE_SOLID
+soliddata_DATA = $(DIST_solid)
+endif
 
 DIST_rsrc = \
 	newres.h \
@@ -83,7 +87,7 @@ skins2_default_vlt_FILES = \
 
 skins2/default.vlt: $(skins2_default_vlt_FILES)
 	mkdir -p skins2
-	tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+	tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
 
 DIST_http = \
 	http/.hosts \
@@ -189,11 +193,20 @@ 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
 nobase_vlclib_DATA = \
+	lua/intf/luac.luac \
 	lua/intf/rc.luac \
 	lua/intf/hotkeys.luac \
 	lua/intf/modules/common.luac \
@@ -203,16 +216,20 @@ nobase_vlclib_DATA = \
 	lua/intf/dumpmeta.luac \
 	lua/meta/art/01_musicbrainz.luac \
 	lua/meta/art/02_frenchtv.luac \
+	lua/meta/art/03_lastfm.luac \
 	lua/meta/art/10_googleimage.luac \
 	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 \
@@ -226,6 +243,8 @@ nobase_vlclib_DATA = \
 	lua/sd/freebox.luac \
 	lua/sd/frenchtv.luac \
 	lua/sd/icecast.luac \
+	lua/sd/jamendo.luac \
+	lua/sd/appletrailers.luac \
 	$(NULL)
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
@@ -241,6 +260,7 @@ EXTRA_DIST += \
 	lua/meta/art/README.txt \
 	lua/meta/art/01_musicbrainz.lua \
 	lua/meta/art/02_frenchtv.lua \
+	lua/meta/art/03_lastfm.lua \
 	lua/meta/art/10_googleimage.lua \
 	lua/meta/fetcher/README.txt \
 	lua/meta/fetcher/tvrage.lua \
@@ -250,8 +270,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 \
@@ -265,6 +287,7 @@ EXTRA_DIST += \
 	lua/intf/README.txt \
 	lua/intf/http.lua \
 	lua/intf/rc.lua \
+	lua/intf/luac.lua \
 	lua/intf/hotkeys.lua \
 	lua/intf/modules/common.lua \
 	lua/intf/modules/host.lua \
@@ -277,7 +300,9 @@ EXTRA_DIST += \
 	lua/sd/fmc.lua \
 	lua/sd/freebox.lua \
 	lua/sd/frenchtv.lua \
-	lua/sd/icecast.lua
+	lua/sd/icecast.lua \
+	lua/sd/appletrailers.lua \
+	lua/sd/jamendo.lua
 
 DIST_http_lua = \
 	lua/http/.hosts \
@@ -373,3 +398,8 @@ DIST_maemo = \
 
 maemo_FILES = \
 	vlc32x32.png
+
+DIST_solid = \
+	solid/vlc-opencda.desktop \
+	solid/vlc-opendvd.desktop \
+	solid/vlc-openvcd.desktop