Cosmetic changes

diff --git a/share/Makefile.am b/share/Makefile.am
index 9e3e88df860648a3e4095eb39698ee8fefefeee6..d0e8ddaaf3839548b73979cba6cd6cd0c16f945d 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,11 +1,6 @@
-NULL =
-
-EXTRA_DIST = $(DIST_rsrc) $(DIST_fonts) \
+EXTRA_DIST = $(DIST_rsrc) \
        $(skins2_default_vlt_FILES)
-
-nobase_dist_data_DATA = \
-       $(DIST_applications) \
-       $(NULL)
+MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
 
 pkgdatadir = $(datadir)/vlc
 
@@ -14,32 +9,23 @@ dist_pkgdata_DATA = \
        $(DIST_icons16) \
        $(DIST_icons32) \
        $(DIST_icons48) \
-       $(DIST_icons128) \
-       $(NULL)
+       $(DIST_icons128)
 
 nobase_dist_pkgdata_DATA = \
        $(DIST_skins2) \
        $(DIST_http) \
        $(DIST_osdmenu_default) \
-       $(DIST_osdmenu_dvd) \
-       $(NULL)
+       $(DIST_osdmenu_dvd)
 
 nobase_pkgdata_DATA = skins2/default.vlt
-
-skins2/default.vlt: $(skins2_default_vlt_FILES)
-
-MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
-
-DIST_fonts = \
-       $(NULL)
+nobase_dist_data_DATA = $(DIST_applications)
 
 DIST_rsrc = \
        newres.h \
        resource.h \
        vlc_wince_rc.rc \
        vlc_beos.rsrc \
-       vlc_win32_rc.rc \
-       $(NULL)
+       vlc_win32_rc.rc
 
 DIST_pda = \
         pda-forwardb16x16.xpm \
@@ -49,35 +35,22 @@ DIST_pda = \
         pda-playlistb16x16.xpm \
         pda-preferencesb16x16.xpm \
         pda-rewindb16x16.xpm \
-        pda-stopb16x16.xpm \
-        $(NULL)
+        pda-stopb16x16.xpm
 
-DIST_icons16 = \
-       vlc16x16.png \
-       vlc16x16.xpm \
-       $(NULL)
+DIST_icons16 = vlc16x16.png vlc16x16.xpm
 
-DIST_icons32 = \
-       vlc32x32.png \
-       vlc32x32.xpm \
-       $(NULL)
+DIST_icons32 = vlc32x32.png vlc32x32.xpm
 
-DIST_icons48 = \
-       vlc48x48.ico \
-       vlc48x48.png \
-       $(NULL)
+DIST_icons48 = vlc48x48.ico vlc48x48.png
 
-DIST_icons128 = \
-       vlc128x128.png \
-       $(NULL)
+DIST_icons128 = vlc128x128.png
 
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
        skins2/skin.dtd \
        skins2/skin.catalog \
-       skins2/winamp2.xml \
-       $(NULL)
+       skins2/winamp2.xml
 
 skins2_default_vlt_FILES = \
         skins2/default/main/pause_over.png \
@@ -109,6 +82,10 @@ skins2_default_vlt_FILES = \
         skins2/default/minimal.png \
         skins2/default/equalizer.png
 
+skins2/default.vlt: $(skins2_default_vlt_FILES)
+       mkdir -p skins2
+       tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+
 DIST_http = \
        http/.hosts \
        http/dialogs/.hosts \
@@ -186,8 +163,7 @@ DIST_http = \
        http/style.css \
        http/iehacks.css \
        http/vlm.html \
-       http/vlm_export.html \
-       $(NULL)
+       http/vlm_export.html
 
 DIST_osdmenu_default = \
        osdmenu/default.cfg \
@@ -218,8 +194,7 @@ DIST_osdmenu_default = \
        osdmenu/default/volume/volume_07.png \
        osdmenu/default/volume/volume_08.png \
        osdmenu/default/volume/volume_09.png \
-       osdmenu/default/volume/volume_10.png \
-       $(NULL)
+       osdmenu/default/volume/volume_10.png
 
 DIST_osdmenu_dvd = \
        osdmenu/dvd.cfg \
@@ -250,15 +225,8 @@ DIST_osdmenu_dvd = \
        osdmenu/dvd/volume/volume03.png \
        osdmenu/dvd/volume/volume04.png \
        osdmenu/dvd/volume/volume05.png \
-       osdmenu/dvd/unselect/barroff.png \
-       $(NULL)
+       osdmenu/dvd/unselect/barroff.png
 
 DIST_applications = \
        applications/vlc.desktop \
-       applications/gnome-vlc-default.sh \
-       $(NULL)
-
-skins2/default.vlt:
-       mkdir -p skins2
-       tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-
+       applications/gnome-vlc-default.sh