X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=071df43e4120556e9146a319df4bea626eaae969;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=1e1ca5b87d49f451537b127d834617568ce12e81;hpb=c5329659d46c9e6111dbb3c27b7339058438d01e;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index 1e1ca5b87d..071df43e41 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -4,26 +4,21 @@ MOSTLYCLEANFILES =
 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_icons = \
-	vlc16x16.png vlc16x16.xpm \
-	vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm \
-	vlc48x48.png vlc48x48-christmas.png \
-	vlc128x128.png vlc128x128-christmas.png \
-	vlc256x256.png
-
-install-data-local: $(DIST_icons)
-	for i in $^; do \
-	  dir=$$( basename $$i|sed -e 's/vlc\([0-9]*x[0-9]*\).*/\1/' ) ; \
-	  name=vlc$$( basename $$i|sed -e 's/vlc[0-9]*x[0-9]*\(.*\)/\1/' ) ; \
-	  $(INSTALL) -d $(DESTDIR)$(iconsdatadir)/$${dir}/apps ; \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(iconsdatadir)/$${dir}/apps/$${name} ; \
-	done
-
+dist_vlcdata_DATA = icons/vlc.ico
+dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
+dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
+		    icons/32x32/vlc-christmas.xpm
+dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
+dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
+dist_icons256_DATA = icons/256x256/vlc.png
 
 nobase_dist_vlcdata_SCRIPTS = \
 	utils/gnome-vlc-default.sh \
@@ -41,7 +36,6 @@ EXTRA_DIST = \
 	$(DIST_osdmenu_default) \
 	$(DIST_mozilla) \
 	$(DIST_maemo) \
-	$(DIST_icons) \
 	$(DIST_solid)
 
 nobase_vlcdata_DATA =
@@ -154,7 +148,7 @@ DIST_http = \
 	http/requests/status.xml \
 	http/requests/vlm.xml \
 	http/requests/vlm_cmd.xml \
-	http/requests/readme \
+	http/requests/README.txt \
 	http/style.css \
 	http/iehacks.css \
 	http/vlm.html \
@@ -223,10 +217,10 @@ nobase_vlclib_DATA = \
 	lua/intf/modules/host.luac \
 	lua/intf/rc.luac \
 	lua/intf/telnet.luac \
-	lua/meta/art/01_musicbrainz.luac \
+	lua/meta/art/04_musicbrainz.luac \
 	lua/meta/art/02_frenchtv.luac \
 	lua/meta/art/03_lastfm.luac \
-	lua/meta/art/10_googleimage.luac \
+	lua/meta/art/01_googleimage.luac \
 	lua/meta/fetcher/tvrage.luac \
 	lua/meta/reader/filename.luac \
 	lua/modules/sandbox.luac \
@@ -251,7 +245,6 @@ nobase_vlclib_DATA = \
 	lua/playlist/mpora.luac \
 	lua/playlist/pinkbike.luac \
 	lua/playlist/rockbox_fm_presets.luac \
-	lua/playlist/vimeo.luac \
 	lua/playlist/youtube.luac \
 	lua/playlist/youtube_homepage.luac \
 	lua/sd/appletrailers.luac \
@@ -286,10 +279,10 @@ EXTRA_DIST += \
 	lua/intf/rc.lua \
 	lua/intf/telnet.lua \
 	lua/meta/art/README.txt \
-	lua/meta/art/01_musicbrainz.lua \
+	lua/meta/art/04_musicbrainz.lua \
 	lua/meta/art/02_frenchtv.lua \
 	lua/meta/art/03_lastfm.lua \
-	lua/meta/art/10_googleimage.lua \
+	lua/meta/art/01_googleimage.lua \
 	lua/meta/fetcher/README.txt \
 	lua/meta/fetcher/tvrage.lua \
 	lua/meta/reader/README.txt \
@@ -317,7 +310,6 @@ EXTRA_DIST += \
 	lua/playlist/mpora.lua \
 	lua/playlist/pinkbike.lua \
 	lua/playlist/rockbox_fm_presets.lua \
-	lua/playlist/vimeo.lua \
 	lua/playlist/youtube.lua \
 	lua/playlist/youtube_homepage.lua \
 	lua/sd/README.txt \
@@ -388,7 +380,7 @@ DIST_http_lua = \
 	lua/http/requests/status.xml \
 	lua/http/requests/vlm.xml \
 	lua/http/requests/vlm_cmd.xml \
-	lua/http/requests/readme \
+	lua/http/requests/README.txt \
 	lua/http/style.css \
 	lua/http/iehacks.css \
 	lua/http/vlm.html \