Drop the icons resolution from their name

(cherry picked from commit d1b5547ce1227614d72ad28b078a31cbd09629ae)
(cherry picked from commit 3d2ef5f961a59b44fc7e966608c6a4a196fdba54)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Makefile.am

@@ -735,7 +735,7 @@ package-win-common:
 	$(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-	cp $(srcdir)/share/vlc.ico $(win32_destdir)/
+	cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
 
 # Copy the locales
 	mkdir -p $(win32_destdir)/locale

bin/Makefile.am

@@ -55,7 +55,7 @@ endif
 	$(SHELL) ./config.status --file="bin/$@"
 
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \

modules/gui/qt4/qt4.cpp

@@ -42,8 +42,8 @@
  #include <vlc_xlib.h>
 #endif
 
-#include "../../../share/vlc32x32.xpm"
-#include "../../../share/vlc32x32-christmas.xpm"
+#include "../../../share/icons/32x32/vlc.xpm"
+#include "../../../share/icons/32x32/vlc-christmas.xpm"
 #include <vlc_plugin.h>
 
 #ifdef WIN32 /* For static builds */

modules/gui/qt4/vlc.qrc

 <RCC>
     <qresource prefix="/logo" >
-        <file alias="vlc128.png" >../../../share/vlc128x128.png</file>
-        <file alias="vlc16.png" >../../../share/vlc16x16.png</file>
-        <file alias="vlc48.png" >../../../share/vlc48x48.png</file>
-        <file alias="vlc128-christmas.png" >../../../share/vlc128x128-christmas.png</file>
-        <file alias="vlc48-christmas.png" >../../../share/vlc48x48-christmas.png</file>
+        <file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file>
+        <file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file>
+        <file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file>
+        <file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file>
+        <file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file>
     </qresource>
     <qresource prefix="/menu" >
         <file alias="help" >pixmaps/menus/help_16px.png</file>

share/Makefile.am

@@ -12,12 +12,13 @@ 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 = 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 \