Distribute data files regardless of features set

Installation that needs to be disabled, not distribution!

diff --git a/share/Makefile.am b/share/Makefile.am
index 8347afaa439cb228cf2a87b086c5d22fabcc7b00..e48615b859e4f9195dbea2d8d19933222e7ff7eb 100644 (file)
--- 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) \
@@ -26,9 +30,30 @@ nobase_dist_pkgdata_DATA = \
 
 if BUILD_SKINS
 nobase_pkgdata_DATA = skins2/default.vlt
+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
-nobase_dist_data_DATA = applications/vlc.desktop
-
 
 DIST_rsrc = \
        newres.h \
@@ -37,7 +62,6 @@ DIST_rsrc = \
        vlc_beos.rsrc \
        vlc_win32_rc.rc
 
-if BUILD_PDA
 DIST_pda = \
        pda-forwardb16x16.xpm \
        pda-openb16x16.xpm \
@@ -47,7 +71,6 @@ DIST_pda = \
        pda-preferencesb16x16.xpm \
        pda-rewindb16x16.xpm \
        pda-stopb16x16.xpm
-endif
 
 DIST_icons16 = vlc16x16.png vlc16x16.xpm
 
@@ -57,7 +80,6 @@ DIST_icons48 = vlc48x48.ico vlc48x48.png vlc48x48-christmas.png
 
 DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
 
-if BUILD_SKINS
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
        skins2/fonts/FreeSansBold.ttf \
@@ -98,9 +120,7 @@ skins2_default_vlt_FILES = \
 skins2/default.vlt: $(skins2_default_vlt_FILES)
        mkdir -p skins2
        tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-endif
 
-if BUILD_HTTPD
 DIST_http = \
        http/.hosts \
        http/dialogs/.hosts \
@@ -180,9 +200,7 @@ DIST_http = \
        http/vlm.html \
        http/vlm_export.html \
        http/flash.html
-endif
 
-if BUILD_OSDMENU
 DIST_osdmenu_default = \
        osdmenu/default.cfg \
        osdmenu/default/unselected.png \
@@ -256,9 +274,7 @@ DIST_osdmenu_minimal = \
        osdmenu/minimal/fs_panel_volume_min.png \
        osdmenu/minimal/fs_panel.png \
        osdmenu/minimal/fs_panel_mockup.png
-endif
 
-if BUILD_LUA
 DIST_lua= \
        lua/meta/README.txt \
        lua/meta/googleimage.lua \
@@ -351,9 +367,7 @@ DIST_http_lua = \
        lua/http/vlm.html \
        lua/http/vlm_export.html \
        lua/http/flash.html
-endif
 
-if BUILD_MOZILLA
 DIST_mozilla = \
        mozilla/fullscreen.xpm \
        mozilla/pause.xpm \
@@ -367,4 +381,3 @@ DIST_mozilla = \
        mozilla/volume_max.xpm \
        mozilla/volume_mute.xpm \
        mozilla/volume_slider_bar.xpm
-endif