X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=59d424f1992c315ef95965a238eabda7d64bccf8;hb=892f767975242d1962ee500aa9af1bf3880387fa;hp=df53119ece64005c175a45f8343c0eda664b3947;hpb=d8b6a43aa36771282a71a5983f813cd5f2c48471;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index df53119ece..59d424f199 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,57 +1,70 @@
-EXTRA_DIST = $(DIST_rsrc) \
-	$(skins2_default_vlt_FILES)
-MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) 
+CLEANFILES = skins2/default.vlt
+MOSTLYCLEANFILES =
 
-pkgdatadir = $(datadir)/vlc
+appdatadir = $(datadir)/applications/
 
-dist_pkgdata_DATA = \
-	$(DIST_pda) \
-	$(DIST_icons16) \
-	$(DIST_icons32) \
-	$(DIST_icons48) \
-	$(DIST_icons128)
+iconsdatadir = $(datadir)/icons/hicolor/
+icons16dir = $(iconsdatadir)/16x16/apps/
+icons32dir = $(iconsdatadir)/32x32/apps/
+icons48dir = $(iconsdatadir)/48x48/apps/
+icons128dir = $(iconsdatadir)/128x128/apps/
+icons256dir = $(iconsdatadir)/256x256/apps/
 
-nobase_dist_pkgdata_DATA = \
+dist_appdata_DATA = vlc.desktop
+
+dist_vlcdata_DATA = vlc.ico
+dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
+dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
+dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
+dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
+dist_icons256_DATA = vlc256x256.png
+
+nobase_dist_vlcdata_SCRIPTS = \
 	utils/gnome-vlc-default.sh \
 	utils/audio-vlc-default.sh \
 	utils/video-vlc-default.sh \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(skins2_default_vlt_FILES) \
+	$(DIST_rsrc) \
 	$(DIST_skins2) \
 	$(DIST_http) \
 	$(DIST_http_lua) \
 	$(DIST_lua) \
 	$(DIST_osdmenu_default) \
-	$(DIST_osdmenu_dvd) \
-	$(DIST_osdmenu_minimal) \
-	$(DIST_mozilla)
-
-nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_data_DATA = applications/vlc.desktop
+	$(DIST_mozilla) \
+	$(DIST_maemo) \
+	$(DIST_solid)
 
+nobase_vlcdata_DATA =
+if BUILD_SKINS
+nobase_vlcdata_DATA += skins2/default.vlt
+nobase_vlcdata_DATA += $(DIST_skins2)
+endif
+if BUILD_HTTPD
+nobase_vlcdata_DATA += $(DIST_http)
+endif
+if BUILD_OSDMENU
+nobase_vlcdata_DATA += \
+	$(DIST_osdmenu_default)
+endif
+if BUILD_MOZILLA
+# TODO: move to the mozilla directory
+nobase_vlcdata_DATA += $(DIST_mozilla)
+endif
+if BUILD_HILDON
+nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
+endif
+if KDE_SOLID
+soliddata_DATA = $(DIST_solid)
+endif
 
 DIST_rsrc = \
 	newres.h \
 	resource.h \
 	vlc_wince_rc.rc \
-	vlc_beos.rsrc \
-	vlc_win32_rc.rc
-
-DIST_pda = \
-	pda-forwardb16x16.xpm \
-	pda-openb16x16.xpm \
-	pda-pauseb16x16.xpm \
-	pda-playb16x16.xpm \
-	pda-playlistb16x16.xpm \
-	pda-preferencesb16x16.xpm \
-	pda-rewindb16x16.xpm \
-	pda-stopb16x16.xpm
-
-DIST_icons16 = vlc16x16.png vlc16x16.xpm
-
-DIST_icons32 = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
-
-DIST_icons48 = vlc48x48.ico vlc48x48.png vlc48x48-christmas.png
-
-DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
+	vlc_beos.rsrc
 
 DIST_skins2 = \
 	skins2/fonts/FreeSans.ttf \
@@ -61,34 +74,16 @@ DIST_skins2 = \
 	skins2/winamp2.xml
 
 skins2_default_vlt_FILES = \
-	skins2/default/main/pause_over.png \
-	skins2/default/main/main_up.png \
-	skins2/default/main/timeslider.png \
-	skins2/default/main/main_down.png \
-	skins2/default/main/main.png \
-	skins2/default/main/dvd_prevtitle.png \
-	skins2/default/main/dvd_nexttitle.png \
-	skins2/default/main/dvd_nextchapter.png \
-	skins2/default/main/pause_up.png \
-	skins2/default/main/main_over.png \
-	skins2/default/main/pause_down.png \
-	skins2/default/main/dvd_prevchapter.png \
-	skins2/default/main/vol_bg.png \
-	skins2/default/main/vol_mask.png \
-	skins2/default/main/vol_slider.png \
-	skins2/default/main/dvd_menu.png \
-	skins2/default/switch.png \
-	skins2/default/font.otf \
-	skins2/default/credits.png \
-	skins2/default/theme.xml \
-	skins2/default/playlist/plscroller.png \
-	skins2/default/playlist/playlist_down.png \
-	skins2/default/playlist/playtreeglyphs.png \
-	skins2/default/playlist/playlist_up.png \
-	skins2/default/playlist/playlist_over.png \
-	skins2/default/playlist/playlist.png \
-	skins2/default/minimal.png \
-	skins2/default/equalizer.png
+        skins2/default/theme.xml \
+	skins2/default/subX/about.png \
+	skins2/default/subX/eq.png \
+	skins2/default/subX/font.otf \
+	skins2/default/subX/main.png \
+	skins2/default/subX/playtreeglyphs.png \
+	skins2/default/subX/pl.png \
+	skins2/default/subX/sysbuttons.png \
+	skins2/default/subX/vol_anim.png \
+	skins2/default/subX/vol_slider.png
 
 skins2/default.vlt: $(skins2_default_vlt_FILES)
 	mkdir -p skins2
@@ -147,21 +142,6 @@ DIST_http = \
 	http/js/mosaic.js \
 	http/js/vlm.js \
 	http/mosaic.html \
-	http/old/.hosts \
-	http/old/admin/.access \
-	http/old/admin/browse.html \
-	http/old/admin/dboxfiles.html \
-	http/old/admin/index.html \
-	http/old/cone_minus.png \
-	http/old/cone_plus.png \
-	http/old/index.html \
-	http/old/info.html \
-	http/old/style.css \
-	http/old/vlm/edit.html \
-	http/old/vlm/index.html \
-	http/old/vlm/new.html \
-	http/old/vlm/show.html \
-	http/old/webcam.html \
 	http/requests/browse.xml \
 	http/requests/playlist.xml \
 	http/requests/status.xml \
@@ -205,73 +185,120 @@ DIST_osdmenu_default = \
 	osdmenu/default/volume/volume_09.png \
 	osdmenu/default/volume/volume_10.png
 
-DIST_osdmenu_dvd = \
-	osdmenu/dvd.cfg \
-	osdmenu/dvd/selection/bw.png \
-	osdmenu/dvd/selection/esc.png \
-	osdmenu/dvd/selection/fw.png \
-	osdmenu/dvd/selection/mute.png \
-	osdmenu/dvd/selection/next.png \
-	osdmenu/dvd/selection/pause.png \
-	osdmenu/dvd/selection/play.png \
-	osdmenu/dvd/selection/previous.png \
-	osdmenu/dvd/selection/slow.png \
-	osdmenu/dvd/selection/stop.png \
-	osdmenu/dvd/selected/bw.png \
-	osdmenu/dvd/selected/next.png \
-	osdmenu/dvd/selected/play.png \
-	osdmenu/dvd/selected/fw.png \
-	osdmenu/dvd/selected/stop.png \
-	osdmenu/dvd/selected/pause.png \
-	osdmenu/dvd/selected/previous.png \
-	osdmenu/dvd/selected/esc.png \
-	osdmenu/dvd/selected/mute.png \
-	osdmenu/dvd/selected/slow.png \
-	osdmenu/dvd/selected/volume.png \
-	osdmenu/dvd/volume/volume00.png \
-	osdmenu/dvd/volume/volume01.png \
-	osdmenu/dvd/volume/volume02.png \
-	osdmenu/dvd/volume/volume03.png \
-	osdmenu/dvd/volume/volume04.png \
-	osdmenu/dvd/volume/volume05.png \
-	osdmenu/dvd/unselect/barroff.png
+#
+# LUA
+#
+luac_verbose = $(luac_verbose_$(V))
+luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY))
+luac_verbose_0 = @echo "  LUAC   $@";
+
+.lua.luac:
+	$(AM_V_at)for f in $(EXTRA_DIST); do \
+		test "$(srcdir)" = . || f="$(srcdir)/$$f"; \
+		if test $$f = $<; then \
+			exit 0; \
+		fi; \
+	done; \
+	echo "Attempt to byte-compile unknown file: $(<)!"; \
+	exit 1
+	$(AM_V_at)mkdir -p "$$(dirname '$@')"
+	$(luac_verbose)$(LUAC) -o $@ $<
 
-DIST_osdmenu_minimal = \
-	osdmenu/minimal.cfg \
-	osdmenu/minimal/fs_panel_simple.xcf \
-	osdmenu/minimal/fs_panel_skip_next.png \
-	osdmenu/minimal/fs_panel_simple.png \
-	osdmenu/minimal/fs_panel_volume_max.png \
-	osdmenu/minimal/fs_panel.xcf \
-	osdmenu/minimal/fs_panel_skip_previous.png \
-	osdmenu/minimal/fs_panel_volume_min.png \
-	osdmenu/minimal/fs_panel.png \
-	osdmenu/minimal/fs_panel_mockup.png
+if BUILD_LUA
+nobase_vlclib_DATA = \
+	lua/intf/luac.luac \
+	lua/intf/rc.luac \
+	lua/intf/hotkeys.luac \
+	lua/intf/modules/common.luac \
+	lua/intf/modules/host.luac \
+	lua/intf/telnet.luac \
+	lua/intf/dummy.luac \
+	lua/intf/dumpmeta.luac \
+	lua/meta/art/01_musicbrainz.luac \
+	lua/meta/art/02_frenchtv.luac \
+	lua/meta/art/10_googleimage.luac \
+	lua/meta/fetcher/tvrage.luac \
+	lua/meta/reader/filename.luac \
+	lua/modules/sandbox.luac \
+	lua/modules/simplexml.luac \
+	lua/playlist/anevia_streams.luac \
+	lua/playlist/appletrailers.luac \
+	lua/playlist/break.luac \
+	lua/playlist/cue.luac \
+	lua/playlist/dailymotion.luac \
+	lua/playlist/france2.luac \
+	lua/playlist/googlevideo.luac \
+	lua/playlist/jamendo.luac \
+	lua/playlist/joox.luac \
+	lua/playlist/katsomo.luac \
+	lua/playlist/lelombrik.luac \
+	lua/playlist/megavideo.luac \
+	lua/playlist/metacafe.luac \
+	lua/playlist/mpora.luac \
+	lua/playlist/vimeo.luac \
+	lua/playlist/youtube.luac \
+	lua/playlist/youtube_homepage.luac \
+	lua/sd/fmc.luac \
+	lua/sd/freebox.luac \
+	lua/sd/frenchtv.luac \
+	lua/sd/icecast.luac \
+	lua/sd/jamendo.luac \
+	$(NULL)
+if BUILD_HTTPD
+nobase_vlclib_DATA += \
+	lua/intf/http.luac \
+	$(NULL)
+nobase_vlcdata_DATA += $(DIST_http_lua)
+endif
+endif
+MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 
-DIST_lua= \
-	lua/meta/README.txt \
-	lua/meta/googleimage.lua \
+EXTRA_DIST += \
+	lua/README.txt \
+	lua/meta/art/README.txt \
+	lua/meta/art/01_musicbrainz.lua \
+	lua/meta/art/02_frenchtv.lua \
+	lua/meta/art/10_googleimage.lua \
+	lua/meta/fetcher/README.txt \
+	lua/meta/fetcher/tvrage.lua \
+	lua/meta/reader/README.txt \
+	lua/meta/reader/filename.lua \
 	lua/playlist/README.txt \
+	lua/playlist/anevia_streams.lua \
 	lua/playlist/appletrailers.lua \
 	lua/playlist/break.lua \
+	lua/playlist/cue.lua \
 	lua/playlist/dailymotion.lua \
+	lua/playlist/france2.lua \
+	lua/playlist/jamendo.lua \
 	lua/playlist/joox.lua \
+	lua/playlist/katsomo.lua \
 	lua/playlist/lelombrik.lua \
 	lua/playlist/youtube.lua \
 	lua/playlist/youtube_homepage.lua \
 	lua/playlist/megavideo.lua \
 	lua/playlist/metacafe.lua \
 	lua/playlist/googlevideo.lua \
+	lua/playlist/mpora.lua \
+	lua/playlist/vimeo.lua \
+	lua/intf/README.txt \
 	lua/intf/http.lua \
 	lua/intf/rc.lua \
+	lua/intf/luac.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
+	lua/intf/dummy.lua \
+	lua/intf/dumpmeta.lua \
+	lua/modules/sandbox.lua \
+	lua/modules/simplexml.lua \
+	lua/sd/README.txt \
+	lua/sd/fmc.lua \
+	lua/sd/freebox.lua \
+	lua/sd/frenchtv.lua \
+	lua/sd/icecast.lua \
+	lua/sd/jamendo.lua
 
 DIST_http_lua = \
 	lua/http/.hosts \
@@ -328,21 +355,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 \
@@ -368,3 +380,22 @@ DIST_mozilla = \
 	mozilla/volume_max.xpm \
 	mozilla/volume_mute.xpm \
 	mozilla/volume_slider_bar.xpm
+
+DIST_maemo = \
+	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_FILES = \
+	vlc32x32.png
+
+DIST_solid = \
+	solid/vlc-opencda.desktop \
+	solid/vlc-opendvd.desktop \
+	solid/vlc-openvcd.desktop