[vlc-devel] commit: Fix distribution in share/ (Christophe Mutricy )

git version control git at videolan.org
Tue Jul 28 23:17:06 CEST 2009


vlc | branch: 1.0-bugfix | Christophe Mutricy <xtophe at videolan.org> | Mon Jul 27 23:20:22 2009 +0100| [0ca052d6f8936d3e466b158b859fb6905b429fcb] | committer: Christophe Mutricy 

Fix distribution in share/

EXTRA_DATA doesn't seem to be a "primary" even if DATA is and EXTRA is a valid prefix.
Also i don't think .vlt are often rebuilt so it should be in clean rather than mostly clean
(cherry picked from commit 4fdaf53d78ef39126872dc84f68399c3da0f6351)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ca052d6f8936d3e466b158b859fb6905b429fcb
---

 share/Makefile.am |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 486c139..568023f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,4 @@
-MOSTLYCLEANFILES = $(nodist_EXTRA_DATA)
+CLEANFILES = skins2/default.vlt
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
@@ -15,10 +15,7 @@ nobase_dist_vlcdata_SCRIPTS = \
 	$(NULL)
 
 EXTRA_DIST = \
-	$(skins2_default_vlt_FILES)
-
-nobase_vlcdata_DATA =
-dist_EXTRA_DATA = \
+	$(skins2_default_vlt_FILES) \
 	$(DIST_rsrc) \
 	$(DIST_pda) \
 	$(DIST_skins2) \
@@ -28,9 +25,8 @@ dist_EXTRA_DATA = \
 	$(DIST_osdmenu_default) \
 	$(DIST_mozilla) \
 	$(DIST_maemo)
-nodist_EXTRA_DATA = \
-	 skins2/default.vlt
 
+nobase_vlcdata_DATA =
 if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)




More information about the vlc-devel mailing list