X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=6e5a767a6e5492f97cc2a7ed53c83cf2f0cd5418;hb=326015842fbb404a7d947d1d7cdeb64fe879b69c;hp=df53119ece64005c175a45f8343c0eda664b3947;hpb=d8b6a43aa36771282a71a5983f813cd5f2c48471;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index df53119ece..6e5a767a6e 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,20 +1,24 @@
-EXTRA_DIST = $(DIST_rsrc) \
-	$(skins2_default_vlt_FILES)
 MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) 
 
 pkgdatadir = $(datadir)/vlc
 
+nobase_dist_data_DATA = applications/vlc.desktop
+
 dist_pkgdata_DATA = \
-	$(DIST_pda) \
 	$(DIST_icons16) \
 	$(DIST_icons32) \
 	$(DIST_icons48) \
 	$(DIST_icons128)
-
 nobase_dist_pkgdata_DATA = \
 	utils/gnome-vlc-default.sh \
 	utils/audio-vlc-default.sh \
 	utils/video-vlc-default.sh \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(DIST_rsrc) \
+	$(DIST_pda) \
+	$(skins2_default_vlt_FILES) \
 	$(DIST_skins2) \
 	$(DIST_http) \
 	$(DIST_http_lua) \
@@ -24,9 +28,32 @@ nobase_dist_pkgdata_DATA = \
 	$(DIST_osdmenu_minimal) \
 	$(DIST_mozilla)
 
+if BUILD_SKINS
 nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_data_DATA = applications/vlc.desktop
-
+nobase_dist_pkgdata_DATA += $(DIST_skins2)
+endif
+if BUILD_PDA
+nobase_dist_pkgdata_DATA += $(DIST_pda)
+endif
+if BUILD_HTTPD
+nobase_dist_pkgdata_DATA += $(DIST_http)
+endif
+if BUILD_OSDMENU
+nobase_dist_pkgdata_DATA += \
+	$(DIST_osdmenu_default) \
+	$(DIST_osdmenu_dvd) \
+	$(DIST_osdmenu_minimal)
+endif
+if BUILD_LUA
+nobase_dist_pkgdata_DATA += $(DIST_lua)
+if BUILD_HTTPD
+nobase_dist_pkgdata_DATA += $(DIST_http_lua)
+endif
+endif
+if BUILD_MOZILLA
+# TODO: move to the mozilla directory
+nobase_dist_pkgdata_DATA += $(DIST_mozilla)
+endif
 
 DIST_rsrc = \
 	newres.h \
@@ -255,6 +282,7 @@ DIST_lua= \
 	lua/playlist/appletrailers.lua \
 	lua/playlist/break.lua \
 	lua/playlist/dailymotion.lua \
+	lua/playlist/france2.lua \
 	lua/playlist/joox.lua \
 	lua/playlist/lelombrik.lua \
 	lua/playlist/youtube.lua \
@@ -267,8 +295,6 @@ DIST_lua= \
 	lua/intf/hotkeys.lua \
 	lua/intf/modules/common.lua \
 	lua/intf/modules/host.lua \
-	lua/intf/modules/httpd.lua \
-	lua/intf/modules/acl.lua \
 	lua/intf/modules/sandbox.lua \
 	lua/intf/telnet.lua \
 	lua/intf/dummy.lua
@@ -328,21 +354,6 @@ DIST_http_lua = \
 	lua/http/js/mosaic.js \
 	lua/http/js/vlm.js \
 	lua/http/mosaic.html \
-	lua/http/old/.hosts \
-	lua/http/old/admin/.access \
-	lua/http/old/admin/browse.html \
-	lua/http/old/admin/dboxfiles.html \
-	lua/http/old/admin/index.html \
-	lua/http/old/cone_minus.png \
-	lua/http/old/cone_plus.png \
-	lua/http/old/index.html \
-	lua/http/old/info.html \
-	lua/http/old/style.css \
-	lua/http/old/vlm/edit.html \
-	lua/http/old/vlm/index.html \
-	lua/http/old/vlm/new.html \
-	lua/http/old/vlm/show.html \
-	lua/http/old/webcam.html \
 	lua/http/requests/browse.xml \
 	lua/http/requests/playlist.xml \
 	lua/http/requests/status.xml \