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

dist_ makes no sense inside automake conditionals

(cherry picked from commit 3709fb1e)
parent 23a91c0e
...@@ -14,7 +14,7 @@ nobase_dist_vlcdata_SCRIPTS = \ ...@@ -14,7 +14,7 @@ nobase_dist_vlcdata_SCRIPTS = \
utils/video-vlc-default.sh \ utils/video-vlc-default.sh \
$(NULL) $(NULL)
nobase_dist_vlcdata_DATA = $(NULL) nobase_vlcdata_DATA = $(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
$(DIST_rsrc) \ $(DIST_rsrc) \
...@@ -29,31 +29,31 @@ EXTRA_DIST = \ ...@@ -29,31 +29,31 @@ EXTRA_DIST = \
$(DIST_maemo) $(DIST_maemo)
if BUILD_SKINS if BUILD_SKINS
nobase_vlcdata_DATA = skins2/default.vlt nobase_vlcdata_DATA += skins2/default.vlt
nobase_dist_vlcdata_DATA += $(DIST_skins2) nobase_vlcdata_DATA += $(DIST_skins2)
endif endif
if BUILD_PDA if BUILD_PDA
nobase_dist_vlcdata_DATA += $(DIST_pda) nobase_vlcdata_DATA += $(DIST_pda)
endif endif
if BUILD_HTTPD if BUILD_HTTPD
nobase_dist_vlcdata_DATA += $(DIST_http) nobase_vlcdata_DATA += $(DIST_http)
endif endif
if BUILD_OSDMENU if BUILD_OSDMENU
nobase_dist_vlcdata_DATA += \ nobase_vlcdata_DATA += \
$(DIST_osdmenu_default) $(DIST_osdmenu_default)
endif endif
if BUILD_LUA if BUILD_LUA
nobase_dist_vlcdata_DATA += $(DIST_lua) nobase_vlcdata_DATA += $(DIST_lua)
if BUILD_HTTPD if BUILD_HTTPD
nobase_dist_vlcdata_DATA += $(DIST_http_lua) nobase_vlcdata_DATA += $(DIST_http_lua)
endif endif
endif endif
if BUILD_MOZILLA if BUILD_MOZILLA
# TODO: move to the mozilla directory # TODO: move to the mozilla directory
nobase_dist_vlcdata_DATA += $(DIST_mozilla) nobase_vlcdata_DATA += $(DIST_mozilla)
endif endif
if BUILD_MAEMO if BUILD_MAEMO
nobase_dist_vlcdata_DATA += $(DIST_maemo) nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
endif endif
DIST_rsrc = \ DIST_rsrc = \
......
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