X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=3b8469fac78f1f68d5981b9461579b9bdec622c3;hb=6688fd832c086d98a59764b65178a6c1be94c2c8;hp=486c1392a95f7772e290c50597110f93f983ae6d;hpb=a120d3b56a0234ae8ce92013f6d96a51b6266c1b;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index 486c1392a9..3b8469fac7 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,4 @@
-MOSTLYCLEANFILES = $(nodist_EXTRA_DATA)
+CLEANFILES = skins2/default.vlt
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
@@ -15,12 +15,8 @@ nobase_dist_vlcdata_SCRIPTS = \
 	$(NULL)
 
 EXTRA_DIST = \
-	$(skins2_default_vlt_FILES)
-
-nobase_vlcdata_DATA =
-dist_EXTRA_DATA = \
+	$(skins2_default_vlt_FILES) \
 	$(DIST_rsrc) \
-	$(DIST_pda) \
 	$(DIST_skins2) \
 	$(DIST_http) \
 	$(DIST_http_lua) \
@@ -28,16 +24,12 @@ dist_EXTRA_DATA = \
 	$(DIST_osdmenu_default) \
 	$(DIST_mozilla) \
 	$(DIST_maemo)
-nodist_EXTRA_DATA = \
-	 skins2/default.vlt
 
+nobase_vlcdata_DATA =
 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
@@ -55,7 +47,7 @@ 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
 
@@ -67,16 +59,6 @@ DIST_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
-
 DIST_icons = vlc.ico
 
 DIST_icons16 = vlc16x16.png vlc16x16.xpm
@@ -208,9 +190,12 @@ DIST_osdmenu_default = \
 
 DIST_lua= \
 	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/reader/README.txt \
+	lua/meta/reader/filename.lua \
 	lua/playlist/README.txt \
 	lua/playlist/anevia_streams.lua \
 	lua/playlist/appletrailers.lua \
@@ -218,12 +203,15 @@ 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 \