Incorrect time-offset type in rc module

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 938501ff36b129405bb671a6a40072a183431ced..3abf2d146f014f11cebc9e5dc5c54f4a78f31368 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,22 +1,20 @@
-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_SCRIPTS = \
+nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
 
-nobase_dist_pkgdata_DATA = $(NULL)
+nobase_dist_vlcdata_DATA = $(NULL)
 
 EXTRA_DIST = \
        $(DIST_rsrc) \
@@ -27,39 +25,35 @@ EXTRA_DIST = \
        $(DIST_http_lua) \
        $(DIST_lua) \
        $(DIST_osdmenu_default) \
-       $(DIST_osdmenu_dvd) \
-       $(DIST_osdmenu_minimal) \
        $(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_pkgdata_DATA += $(DIST_maemo)
+nobase_dist_vlcdata_DATA += $(DIST_maemo)
 endif
 
 DIST_rsrc = \
@@ -242,55 +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/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 \