X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=73cdfdb0cd0341d37930c8aa2db102a5645c76de;hb=a0c7001bb2f4c4ba4c807bba1b734bca02beb376;hp=568023f00cb94675b84536975e823387a26849b5;hpb=4fdaf53d78ef39126872dc84f68399c3da0f6351;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index 568023f00c..73cdfdb0cd 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,5 @@
 CLEANFILES = skins2/default.vlt
+MOSTLYCLEANFILES =
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
@@ -17,7 +18,6 @@ nobase_dist_vlcdata_SCRIPTS = \
 EXTRA_DIST = \
 	$(skins2_default_vlt_FILES) \
 	$(DIST_rsrc) \
-	$(DIST_pda) \
 	$(DIST_skins2) \
 	$(DIST_http) \
 	$(DIST_http_lua) \
@@ -31,9 +31,6 @@ if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_PDA
-nobase_vlcdata_DATA += $(DIST_pda)
-endif
 if BUILD_HTTPD
 nobase_vlcdata_DATA += $(DIST_http)
 endif
@@ -41,17 +38,11 @@ if BUILD_OSDMENU
 nobase_vlcdata_DATA += \
 	$(DIST_osdmenu_default)
 endif
-if BUILD_LUA
-nobase_vlcdata_DATA += $(DIST_lua)
-if BUILD_HTTPD
-nobase_vlcdata_DATA += $(DIST_http_lua)
-endif
-endif
 if BUILD_MOZILLA
 # TODO: move to the mozilla directory
 nobase_vlcdata_DATA += $(DIST_mozilla)
 endif
-if BUILD_MAEMO
+if BUILD_HILDON
 nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif
 
@@ -59,19 +50,7 @@ DIST_rsrc = \
 	newres.h \
 	resource.h \
 	vlc_wince_rc.rc \
-	vlc_beos.rsrc \
-	vlc_win32_rc.rc.in \
-	libvlc_win32_rc.rc.in
-
-DIST_pda = \
-	pda-forwardb16x16.xpm \
-	pda-openb16x16.xpm \
-	pda-pauseb16x16.xpm \
-	pda-playb16x16.xpm \
-	pda-playlistb16x16.xpm \
-	pda-preferencesb16x16.xpm \
-	pda-rewindb16x16.xpm \
-	pda-stopb16x16.xpm
+	vlc_beos.rsrc
 
 DIST_icons = vlc.ico
 
@@ -202,11 +181,70 @@ DIST_osdmenu_default = \
 	osdmenu/default/volume/volume_09.png \
 	osdmenu/default/volume/volume_10.png
 
-DIST_lua= \
+#
+# LUA
+#
+luac_verbose = $(luac_verbose_$(V))
+luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY))
+luac_verbose_0 = @echo "  LUAC   $@";
+
+.lua.luac:
+	$(AM_V_at)mkdir -p "$$(dirname '$@')"
+	$(luac_verbose)$(LUAC) -o $@ $<
+
+if BUILD_LUA
+nobase_vlclib_DATA = \
+	lua/intf/rc.luac \
+	lua/intf/hotkeys.luac \
+	lua/intf/modules/common.luac \
+	lua/intf/modules/host.luac \
+	lua/intf/telnet.luac \
+	lua/intf/dummy.luac \
+	lua/intf/dumpmeta.luac \
+	lua/meta/art/01_musicbrainz.luac \
+	lua/meta/art/02_frenchtv.luac \
+	lua/meta/art/10_googleimage.luac \
+	lua/meta/fetcher/tvrage.luac \
+	lua/meta/reader/filename.luac \
+	lua/modules/sandbox.luac \
+	lua/playlist/anevia_streams.luac \
+	lua/playlist/appletrailers.luac \
+	lua/playlist/break.luac \
+	lua/playlist/dailymotion.luac \
+	lua/playlist/france2.luac \
+	lua/playlist/googlevideo.luac \
+	lua/playlist/joox.luac \
+	lua/playlist/katsomo.luac \
+	lua/playlist/lelombrik.luac \
+	lua/playlist/megavideo.luac \
+	lua/playlist/metacafe.luac \
+	lua/playlist/mpora.luac \
+	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 \
+	$(NULL)
+if BUILD_HTTPD
+nobase_vlclib_DATA += \
+	lua/intf/http.luac \
+	$(NULL)
+nobase_vlcdata_DATA += $(DIST_http_lua)
+endif
+endif
+MOSTLYCLEANFILES += $(vlclua_DATA)
+
+EXTRA_DIST += \
 	lua/README.txt \
-	lua/meta/README.txt \
-	lua/meta/01_musicbrainz.lua \
-	lua/meta/10_googleimage.lua \
+	lua/meta/art/README.txt \
+	lua/meta/art/01_musicbrainz.lua \
+	lua/meta/art/02_frenchtv.lua \
+	lua/meta/art/10_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/anevia_streams.lua \
 	lua/playlist/appletrailers.lua \
@@ -214,21 +252,30 @@ DIST_lua= \
 	lua/playlist/dailymotion.lua \
 	lua/playlist/france2.lua \
 	lua/playlist/joox.lua \
+	lua/playlist/katsomo.lua \
 	lua/playlist/lelombrik.lua \
 	lua/playlist/youtube.lua \
 	lua/playlist/youtube_homepage.lua \
 	lua/playlist/megavideo.lua \
 	lua/playlist/metacafe.lua \
 	lua/playlist/googlevideo.lua \
+	lua/playlist/mpora.lua \
+	lua/playlist/vimeo.lua \
 	lua/intf/README.txt \
 	lua/intf/http.lua \
 	lua/intf/rc.lua \
 	lua/intf/hotkeys.lua \
 	lua/intf/modules/common.lua \
 	lua/intf/modules/host.lua \
-	lua/intf/modules/sandbox.lua \
 	lua/intf/telnet.lua \
-	lua/intf/dummy.lua
+	lua/intf/dummy.lua \
+	lua/intf/dumpmeta.lua \
+	lua/modules/sandbox.lua \
+	lua/modules/simplexml.lua \
+	lua/sd/README.txt \
+	lua/sd/fmc.lua \
+	lua/sd/freebox.lua \
+	lua/sd/frenchtv.lua
 
 DIST_http_lua = \
 	lua/http/.hosts \
@@ -315,12 +362,12 @@ DIST_maemo = \
 	maemo/vlc_intf.rc \
 	maemo/vlc_left_tab_active.png \
 	maemo/vlc_left_tab_passive.png \
-	maemo/playlist.png
+	maemo/playlist.png \
+	maemo/play.png \
+	maemo/pause.png \
+	maemo/stop.png \
+	maemo/previous.png \
+	maemo/next.png
 
 maemo_FILES = \
-	../modules/gui/qt4/pixmaps/play.png \
-	../modules/gui/qt4/pixmaps/pause.png \
-	../modules/gui/qt4/pixmaps/stop.png \
-	../modules/gui/qt4/pixmaps/previous.png \
-	../modules/gui/qt4/pixmaps/next.png \
 	vlc32x32.png