]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lua/http: fix typo
[vlc] / share / Makefile.am
diff --git a/share/Makefile.am b/share/Makefile.am
index cc00c68bf242a9700e1e26f04b8e72c720c356ca..fc026c070ddcb13b2bf50c8f04feb2dd3a812e28 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -4,10 +4,8 @@ EXTRA_DIST =
 
 appdatadir = $(datadir)/applications
 if !HAVE_WIN32
-if !HAVE_WINCE
 appdata_DATA = vlc.desktop
 endif
-endif
 EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
@@ -24,7 +22,6 @@ icons128dir = $(iconsdatadir)/128x128/apps
 icons256dir = $(iconsdatadir)/256x256/apps
 
 if !HAVE_WIN32
-if !HAVE_WINCE
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
@@ -39,45 +36,25 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/video-vlc-default.sh \
        $(NULL)
 endif
-endif
 
 EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
-       $(DIST_rsrc) \
        $(DIST_skins2) \
+       $(DIST_icons) \
        $(DIST_http_lua) \
-       $(DIST_lua) \
-       osdmenu/default.cfg.in \
-       $(DIST_osdmenu_default) \
-       $(DIST_maemo) \
        $(DIST_solid)
-CLEANFILES += osdmenu/default.cfg
 
 nobase_vlcdata_DATA =
 if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_OSDMENU
-nobase_vlcdata_DATA += \
-       osdmenu/default.cfg \
-       $(DIST_osdmenu_default)
-endif
-if BUILD_HILDON
-nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
-endif
 if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
 endif
 
-osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status
-       $(AM_V_GEN)mkdir -p osdmenu; \
-                  sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@
-
-DIST_rsrc = \
-       newres.h \
-       resource.h \
-       vlc_wince_rc.rc
+DIST_icons = \
+       vlc512x512.png
 
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
@@ -87,7 +64,7 @@ DIST_skins2 = \
        skins2/winamp2.xml
 
 skins2_default_vlt_FILES = \
-           skins2/default/theme.xml \
+       skins2/default/theme.xml \
        skins2/default/subX/about.png \
        skins2/default/subX/eq.png \
        skins2/default/subX/font.otf \
@@ -104,35 +81,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
                LC_ALL=C sort -z | \
                tar cvv --exclude .svn --no-recursion --null -T -) | \
        gzip -n > skins2/default.vlt
-DIST_osdmenu_default = \
-       osdmenu/default/unselected.png \
-       osdmenu/default/selection/bw.png \
-       osdmenu/default/selection/esc.png \
-       osdmenu/default/selection/fw.png \
-       osdmenu/default/selection/volume.png \
-       osdmenu/default/selection/next.png \
-       osdmenu/default/selection/play_pause.png \
-       osdmenu/default/selection/previous.png \
-       osdmenu/default/selection/stop.png \
-       osdmenu/default/selected/bw.png \
-       osdmenu/default/selected/next.png \
-       osdmenu/default/selected/play_pause.png \
-       osdmenu/default/selected/fw.png \
-       osdmenu/default/selected/stop.png \
-       osdmenu/default/selected/previous.png \
-       osdmenu/default/selected/esc.png \
-       osdmenu/default/selected/volume.png \
-       osdmenu/default/volume/volume_00.png \
-       osdmenu/default/volume/volume_01.png \
-       osdmenu/default/volume/volume_02.png \
-       osdmenu/default/volume/volume_03.png \
-       osdmenu/default/volume/volume_04.png \
-       osdmenu/default/volume/volume_05.png \
-       osdmenu/default/volume/volume_06.png \
-       osdmenu/default/volume/volume_07.png \
-       osdmenu/default/volume/volume_08.png \
-       osdmenu/default/volume/volume_09.png \
-       osdmenu/default/volume/volume_10.png
 
 #
 # LUA
@@ -155,11 +103,11 @@ luac_verbose_0 = @echo "  LUAC   $@";
 
 if BUILD_LUA
 nobase_vlclib_DATA = \
+       lua/extensions/VLSub.luac \
        lua/intf/cli.luac \
        lua/intf/dummy.luac \
        lua/intf/dumpmeta.luac \
        lua/intf/luac.luac \
-       lua/intf/modules/common.luac \
        lua/intf/modules/host.luac \
        lua/intf/telnet.luac \
        lua/meta/art/02_frenchtv.luac \
@@ -168,6 +116,7 @@ nobase_vlclib_DATA = \
        lua/meta/art/00_musicbrainz.luac \
        lua/meta/fetcher/tvrage.luac \
        lua/meta/reader/filename.luac \
+       lua/modules/common.luac \
        lua/modules/dkjson.luac \
        lua/modules/sandbox.luac \
        lua/modules/simplexml.luac \
@@ -187,6 +136,7 @@ nobase_vlclib_DATA = \
        lua/playlist/katsomo.luac \
        lua/playlist/koreus.luac \
        lua/playlist/lelombrik.luac \
+       lua/playlist/liveleak.luac \
        lua/playlist/metacafe.luac \
        lua/playlist/metachannels.luac \
        lua/playlist/mpora.luac \
@@ -199,17 +149,38 @@ nobase_vlclib_DATA = \
        lua/playlist/youtube_homepage.luac \
        lua/playlist/zapiks.luac \
        lua/sd/fmc.luac \
-       lua/sd/freebox.luac \
        lua/sd/icecast.luac \
+       lua/sd/icast.luac \
        lua/sd/jamendo.luac \
        lua/sd/metachannels.luac \
        $(NULL)
+
+nobase_doc_DATA = \
+       lua/README.txt \
+       lua/extensions/README.txt \
+       lua/intf/README.txt \
+       lua/intf/dumpmeta.lua \
+       lua/meta/art/README.txt \
+       lua/meta/art/01_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/soundcloud.lua \
+       lua/playlist/youtube.lua \
+       lua/sd/README.txt \
+       lua/sd/icecast.lua \
+       lua/sd/icast.lua \
+       $(NULL)
+
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
        lua/intf/http.luac \
        lua/intf/modules/httprequests.luac \
        $(NULL)
 nobase_vlcdata_DATA += $(DIST_http_lua)
+nobase_doc_DATA += lua/http/requests/README.txt
 endif
 endif
 MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
@@ -217,13 +188,13 @@ MOSTLYCLEANFILES += $(nobase_vlclib_DATA)
 EXTRA_DIST += \
        lua/README.txt \
        lua/extensions/README.txt \
+       lua/extensions/VLSub.lua \
        lua/intf/README.txt \
        lua/intf/cli.lua \
        lua/intf/dummy.lua \
        lua/intf/dumpmeta.lua \
        lua/intf/http.lua \
        lua/intf/luac.lua \
-       lua/intf/modules/common.lua \
        lua/intf/modules/host.lua \
        lua/intf/modules/httprequests.lua \
        lua/intf/telnet.lua \
@@ -236,6 +207,7 @@ EXTRA_DIST += \
        lua/meta/fetcher/tvrage.lua \
        lua/meta/reader/README.txt \
        lua/meta/reader/filename.lua \
+       lua/modules/common.lua \
        lua/modules/dkjson.lua \
        lua/modules/sandbox.lua \
        lua/modules/simplexml.lua \
@@ -256,6 +228,7 @@ EXTRA_DIST += \
        lua/playlist/katsomo.lua \
        lua/playlist/koreus.lua \
        lua/playlist/lelombrik.lua \
+       lua/playlist/liveleak.lua \
        lua/playlist/metacafe.lua \
        lua/playlist/metachannels.lua \
        lua/playlist/mpora.lua \
@@ -269,8 +242,8 @@ EXTRA_DIST += \
        lua/playlist/zapiks.lua \
        lua/sd/README.txt \
        lua/sd/fmc.lua \
-       lua/sd/freebox.lua \
        lua/sd/icecast.lua \
+       lua/sd/icast.lua \
        lua/sd/jamendo.lua \
        lua/sd/metachannels.lua
 
@@ -383,21 +356,8 @@ DIST_http_lua = \
        lua/http/js/jquery-ui-1.8.13.custom.min.js \
        lua/http/old/style.css
 
-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 = \
-       icons/32x32/vlc.png
-
 DIST_solid = \
+       solid/vlc-openbd.desktop \
        solid/vlc-opencda.desktop \
        solid/vlc-opendvd.desktop \
        solid/vlc-openvcd.desktop
Unnamed repository; edit this file 'description' to name the repository.