Commit d23984f6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Cosmetic changes

parent 14246592
NULL = EXTRA_DIST = $(DIST_rsrc) \
EXTRA_DIST = $(DIST_rsrc) $(DIST_fonts) \
$(skins2_default_vlt_FILES) $(skins2_default_vlt_FILES)
MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
nobase_dist_data_DATA = \
$(DIST_applications) \
$(NULL)
pkgdatadir = $(datadir)/vlc pkgdatadir = $(datadir)/vlc
...@@ -14,32 +9,23 @@ dist_pkgdata_DATA = \ ...@@ -14,32 +9,23 @@ dist_pkgdata_DATA = \
$(DIST_icons16) \ $(DIST_icons16) \
$(DIST_icons32) \ $(DIST_icons32) \
$(DIST_icons48) \ $(DIST_icons48) \
$(DIST_icons128) \ $(DIST_icons128)
$(NULL)
nobase_dist_pkgdata_DATA = \ nobase_dist_pkgdata_DATA = \
$(DIST_skins2) \ $(DIST_skins2) \
$(DIST_http) \ $(DIST_http) \
$(DIST_osdmenu_default) \ $(DIST_osdmenu_default) \
$(DIST_osdmenu_dvd) \ $(DIST_osdmenu_dvd)
$(NULL)
nobase_pkgdata_DATA = skins2/default.vlt nobase_pkgdata_DATA = skins2/default.vlt
nobase_dist_data_DATA = $(DIST_applications)
skins2/default.vlt: $(skins2_default_vlt_FILES)
MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
DIST_fonts = \
$(NULL)
DIST_rsrc = \ DIST_rsrc = \
newres.h \ newres.h \
resource.h \ resource.h \
vlc_wince_rc.rc \ vlc_wince_rc.rc \
vlc_beos.rsrc \ vlc_beos.rsrc \
vlc_win32_rc.rc \ vlc_win32_rc.rc
$(NULL)
DIST_pda = \ DIST_pda = \
pda-forwardb16x16.xpm \ pda-forwardb16x16.xpm \
...@@ -49,35 +35,22 @@ DIST_pda = \ ...@@ -49,35 +35,22 @@ DIST_pda = \
pda-playlistb16x16.xpm \ pda-playlistb16x16.xpm \
pda-preferencesb16x16.xpm \ pda-preferencesb16x16.xpm \
pda-rewindb16x16.xpm \ pda-rewindb16x16.xpm \
pda-stopb16x16.xpm \ pda-stopb16x16.xpm
$(NULL)
DIST_icons16 = \ DIST_icons16 = vlc16x16.png vlc16x16.xpm
vlc16x16.png \
vlc16x16.xpm \
$(NULL)
DIST_icons32 = \ DIST_icons32 = vlc32x32.png vlc32x32.xpm
vlc32x32.png \
vlc32x32.xpm \
$(NULL)
DIST_icons48 = \ DIST_icons48 = vlc48x48.ico vlc48x48.png
vlc48x48.ico \
vlc48x48.png \
$(NULL)
DIST_icons128 = \ DIST_icons128 = vlc128x128.png
vlc128x128.png \
$(NULL)
DIST_skins2 = \ DIST_skins2 = \
skins2/fonts/FreeSans.ttf \ skins2/fonts/FreeSans.ttf \
skins2/fonts/FreeSansBold.ttf \ skins2/fonts/FreeSansBold.ttf \
skins2/skin.dtd \ skins2/skin.dtd \
skins2/skin.catalog \ skins2/skin.catalog \
skins2/winamp2.xml \ skins2/winamp2.xml
$(NULL)
skins2_default_vlt_FILES = \ skins2_default_vlt_FILES = \
skins2/default/main/pause_over.png \ skins2/default/main/pause_over.png \
...@@ -109,6 +82,10 @@ skins2_default_vlt_FILES = \ ...@@ -109,6 +82,10 @@ skins2_default_vlt_FILES = \
skins2/default/minimal.png \ skins2/default/minimal.png \
skins2/default/equalizer.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 = \ DIST_http = \
http/.hosts \ http/.hosts \
http/dialogs/.hosts \ http/dialogs/.hosts \
...@@ -186,8 +163,7 @@ DIST_http = \ ...@@ -186,8 +163,7 @@ DIST_http = \
http/style.css \ http/style.css \
http/iehacks.css \ http/iehacks.css \
http/vlm.html \ http/vlm.html \
http/vlm_export.html \ http/vlm_export.html
$(NULL)
DIST_osdmenu_default = \ DIST_osdmenu_default = \
osdmenu/default.cfg \ osdmenu/default.cfg \
...@@ -218,8 +194,7 @@ DIST_osdmenu_default = \ ...@@ -218,8 +194,7 @@ DIST_osdmenu_default = \
osdmenu/default/volume/volume_07.png \ osdmenu/default/volume/volume_07.png \
osdmenu/default/volume/volume_08.png \ osdmenu/default/volume/volume_08.png \
osdmenu/default/volume/volume_09.png \ osdmenu/default/volume/volume_09.png \
osdmenu/default/volume/volume_10.png \ osdmenu/default/volume/volume_10.png
$(NULL)
DIST_osdmenu_dvd = \ DIST_osdmenu_dvd = \
osdmenu/dvd.cfg \ osdmenu/dvd.cfg \
...@@ -250,15 +225,8 @@ DIST_osdmenu_dvd = \ ...@@ -250,15 +225,8 @@ DIST_osdmenu_dvd = \
osdmenu/dvd/volume/volume03.png \ osdmenu/dvd/volume/volume03.png \
osdmenu/dvd/volume/volume04.png \ osdmenu/dvd/volume/volume04.png \
osdmenu/dvd/volume/volume05.png \ osdmenu/dvd/volume/volume05.png \
osdmenu/dvd/unselect/barroff.png \ osdmenu/dvd/unselect/barroff.png
$(NULL)
DIST_applications = \ DIST_applications = \
applications/vlc.desktop \ applications/vlc.desktop \
applications/gnome-vlc-default.sh \ applications/gnome-vlc-default.sh
$(NULL)
skins2/default.vlt:
mkdir -p skins2
tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment