X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=share%2FMakefile.am;h=3abf2d146f014f11cebc9e5dc5c54f4a78f31368;hb=7efba6b3d2d1e21645ca1737f8ab78fd8eb62d5e;hp=e48615b859e4f9195dbea2d8d19933222e7ff7eb;hpb=b54b2ddbcb094baa736b565e49643098c9514d1f;p=vlc

diff --git a/share/Makefile.am b/share/Makefile.am
index e48615b859..3abf2d146f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,20 +1,21 @@
-MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) 
-
-pkgdatadir = $(datadir)/vlc
+MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
-dist_pkgdata_DATA = \
+dist_vlcdata_DATA = \
+	$(DIST_icons) \
 	$(DIST_icons16) \
 	$(DIST_icons32) \
 	$(DIST_icons48) \
 	$(DIST_icons128)
-nobase_dist_pkgdata_DATA = \
+nobase_dist_vlcdata_SCRIPTS = \
 	utils/gnome-vlc-default.sh \
 	utils/audio-vlc-default.sh \
 	utils/video-vlc-default.sh \
 	$(NULL)
 
+nobase_dist_vlcdata_DATA = $(NULL)
+
 EXTRA_DIST = \
 	$(DIST_rsrc) \
 	$(DIST_pda) \
@@ -24,35 +25,35 @@ EXTRA_DIST = \
 	$(DIST_http_lua) \
 	$(DIST_lua) \
 	$(DIST_osdmenu_default) \
-	$(DIST_osdmenu_dvd) \
-	$(DIST_osdmenu_minimal) \
-	$(DIST_mozilla)
+	$(DIST_mozilla) \
+	$(DIST_maemo)
 
 if BUILD_SKINS
-nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_pkgdata_DATA += $(DIST_skins2)
+nobase_vlcdata_DATA = skins2/default.vlt
+nobase_dist_vlcdata_DATA += $(DIST_skins2)
 endif
 if BUILD_PDA
-nobase_dist_pkgdata_DATA += $(DIST_pda)
+nobase_dist_vlcdata_DATA += $(DIST_pda)
 endif
 if BUILD_HTTPD
-nobase_dist_pkgdata_DATA += $(DIST_http)
+nobase_dist_vlcdata_DATA += $(DIST_http)
 endif
 if BUILD_OSDMENU
-nobase_dist_pkgdata_DATA += \
-	$(DIST_osdmenu_default) \
-	$(DIST_osdmenu_dvd) \
-	$(DIST_osdmenu_minimal)
+nobase_dist_vlcdata_DATA += \
+	$(DIST_osdmenu_default)
 endif
 if BUILD_LUA
-nobase_dist_pkgdata_DATA += $(DIST_lua)
+nobase_dist_vlcdata_DATA += $(DIST_lua)
 if BUILD_HTTPD
-nobase_dist_pkgdata_DATA += $(DIST_http_lua)
+nobase_dist_vlcdata_DATA += $(DIST_http_lua)
 endif
 endif
 if BUILD_MOZILLA
 # TODO: move to the mozilla directory
-nobase_dist_pkgdata_DATA += $(DIST_mozilla)
+nobase_dist_vlcdata_DATA += $(DIST_mozilla)
+endif
+if BUILD_MAEMO
+nobase_dist_vlcdata_DATA += $(DIST_maemo)
 endif
 
 DIST_rsrc = \
@@ -60,7 +61,8 @@ DIST_rsrc = \
 	resource.h \
 	vlc_wince_rc.rc \
 	vlc_beos.rsrc \
-	vlc_win32_rc.rc
+	vlc_win32_rc.rc.in \
+	libvlc_win32_rc.rc.in
 
 DIST_pda = \
 	pda-forwardb16x16.xpm \
@@ -72,11 +74,13 @@ DIST_pda = \
 	pda-rewindb16x16.xpm \
 	pda-stopb16x16.xpm
 
+DIST_icons = vlc.ico
+
 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_icons48 = vlc48x48.png vlc48x48-christmas.png
 
 DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
 
@@ -232,53 +236,13 @@ 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
-
-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
-
 DIST_lua= \
+	lua/README.txt \
 	lua/meta/README.txt \
-	lua/meta/googleimage.lua \
+	lua/meta/01_musicbrainz.lua \
+	lua/meta/10_googleimage.lua \
 	lua/playlist/README.txt \
+	lua/playlist/anevia_streams.lua \
 	lua/playlist/appletrailers.lua \
 	lua/playlist/break.lua \
 	lua/playlist/dailymotion.lua \
@@ -290,13 +254,12 @@ DIST_lua= \
 	lua/playlist/megavideo.lua \
 	lua/playlist/metacafe.lua \
 	lua/playlist/googlevideo.lua \
+	lua/intf/README.txt \
 	lua/intf/http.lua \
 	lua/intf/rc.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
@@ -381,3 +344,27 @@ 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/vlc32x32.png
+
+maemo_FILES = \
+	../modules/gui/qt4/pixmaps/play.png \
+	../modules/gui/qt4/pixmaps/pause.png \
+	../modules/gui/qt4/pixmaps/stop.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