X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=34d16110cead2f135150147a027a97059665cf71;hb=4eb0c7377363238e1719748e3388e23692faaf0a;hp=67b0a612fc0b0e573a6d29a7556dca3c8a888d28;hpb=0eecb210eb8fd91592847fad7592e0cccacaeff1;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index 67b0a612fc..34d16110ce 100644
--- 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,29 @@ dist_pkgdata_DATA = \
 	$(DIST_icons16) \
 	$(DIST_icons32) \
 	$(DIST_icons48) \
-	$(DIST_icons128) \
-	$(NULL)
+	$(DIST_icons128)
 
 nobase_dist_pkgdata_DATA = \
+	utils/gnome-vlc-default.sh \
+	utils/audio-vlc-default.sh \
+	utils/video-vlc-default.sh \
 	$(DIST_skins2) \
 	$(DIST_http) \
+	$(DIST_lua) \
 	$(DIST_osdmenu_default) \
 	$(DIST_osdmenu_dvd) \
-	$(NULL)
+	$(DIST_osdmenu_minimal)
 
 nobase_pkgdata_DATA = skins2/default.vlt
+nobase_dist_data_DATA = applications/vlc.desktop
 
-skins2/default.vlt: $(skins2_default_vlt_FILES)
-
-MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
-
-DIST_fonts = \
-	$(NULL)
 
 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 +41,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 +88,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 \
@@ -145,6 +128,7 @@ DIST_http = \
 	http/images/slider_left.png \
 	http/images/slider_point.png \
 	http/images/slider_right.png \
+	http/images/snapshot.png \
 	http/images/slow.png \
 	http/images/sort.png \
 	http/images/sout.png \
@@ -186,7 +170,7 @@ DIST_http = \
 	http/iehacks.css \
 	http/vlm.html \
 	http/vlm_export.html \
-	$(NULL)
+	http/flash.html
 
 DIST_osdmenu_default = \
 	osdmenu/default.cfg \
@@ -217,8 +201,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 \
@@ -249,15 +232,27 @@ 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/
+DIST_osdmenu_minimal = \
+	osdmenu/minimal.cfg \
+	osdmenu/minimal/fs_panel_simple.xcf \
+	osdmenu/minimal/fs_panel_skip_next.png \
+	osdmenu/minimal/fs_panel_simple.png \
+	osdmenu/minimal/fs_panel_volume_max.png \
+	osdmenu/minimal/fs_panel.xcf \
+	osdmenu/minimal/fs_panel_skip_previous.png \
+	osdmenu/minimal/fs_panel_volume_min.png \
+	osdmenu/minimal/fs_panel.png \
+	osdmenu/minimal/fs_panel_mockup.png
 
+DIST_lua= \
+	luameta/README.txt \
+	luameta/googleimage.lua \
+	luaplaylist/README.txt \
+	luaplaylist/dailymotion.lua \
+	luaplaylist/lelombrik.lua \
+	luaplaylist/youtube.lua \
+	luaplaylist/youtube_homepage.lua \
+	luaplaylist/metacafe.lua \
+	luaplaylist/googlevideo.lua