-MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
+MOSTLYCLEANFILES = $(nodist_EXTRA_DATA)
nobase_dist_data_DATA = applications/vlc.desktop
utils/video-vlc-default.sh \
$(NULL)
-nobase_dist_vlcdata_DATA = $(NULL)
-
EXTRA_DIST = \
+ $(skins2_default_vlt_FILES)
+
+nobase_vlcdata_DATA =
+dist_EXTRA_DATA = \
$(DIST_rsrc) \
$(DIST_pda) \
- $(skins2_default_vlt_FILES) \
$(DIST_skins2) \
$(DIST_http) \
$(DIST_http_lua) \
$(DIST_osdmenu_default) \
$(DIST_mozilla) \
$(DIST_maemo)
+nodist_EXTRA_DATA = \
+ skins2/default.vlt
if BUILD_SKINS
-nobase_vlcdata_DATA = skins2/default.vlt
-nobase_dist_vlcdata_DATA += $(DIST_skins2)
+nobase_vlcdata_DATA += skins2/default.vlt
+nobase_vlcdata_DATA += $(DIST_skins2)
endif
if BUILD_PDA
-nobase_dist_vlcdata_DATA += $(DIST_pda)
+nobase_vlcdata_DATA += $(DIST_pda)
endif
if BUILD_HTTPD
-nobase_dist_vlcdata_DATA += $(DIST_http)
+nobase_vlcdata_DATA += $(DIST_http)
endif
if BUILD_OSDMENU
-nobase_dist_vlcdata_DATA += \
+nobase_vlcdata_DATA += \
$(DIST_osdmenu_default)
endif
if BUILD_LUA
-nobase_dist_vlcdata_DATA += $(DIST_lua)
+nobase_vlcdata_DATA += $(DIST_lua)
if BUILD_HTTPD
-nobase_dist_vlcdata_DATA += $(DIST_http_lua)
+nobase_vlcdata_DATA += $(DIST_http_lua)
endif
endif
if BUILD_MOZILLA
# TODO: move to the mozilla directory
-nobase_dist_vlcdata_DATA += $(DIST_mozilla)
+nobase_vlcdata_DATA += $(DIST_mozilla)
endif
if BUILD_MAEMO
-nobase_dist_vlcdata_DATA += $(DIST_maemo)
+nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
endif
DIST_rsrc = \
maemo/vlc_intf.rc \
maemo/vlc_left_tab_active.png \
maemo/vlc_left_tab_passive.png \
- maemo/playlist.png \
- maemo/play.png \
- maemo/pause.png \
- maemo/stop.png \
- maemo/previous.png \
- maemo/next.png \
- maemo/vlc32x32.png
+ maemo/playlist.png
maemo_FILES = \
../modules/gui/qt4/pixmaps/play.png \
../modules/gui/qt4/pixmaps/previous.png \
../modules/gui/qt4/pixmaps/next.png \
vlc32x32.png
-
-$(DIST_maemo): $(maemo_FILES)
- mkdir -p maemo
- cp -r $+ maemo