avcodec: only set min/maxrate if rc-buffer-size is set

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index 1d93f1a8adc80b6573a1336a6a75d2c1a9b2e320..6702eb2c5ea2e4b8bd45e35705684c7b28dd3d2f 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,17 +36,14 @@ 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
 
@@ -63,9 +57,6 @@ 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
@@ -74,10 +65,8 @@ 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 \
@@ -158,7 +147,6 @@ nobase_vlclib_DATA = \
        lua/intf/cli.luac \
        lua/intf/dummy.luac \
        lua/intf/dumpmeta.luac \
-       lua/intf/hotkeys.luac \
        lua/intf/luac.luac \
        lua/intf/modules/common.luac \
        lua/intf/modules/host.luac \
@@ -188,7 +176,6 @@ nobase_vlclib_DATA = \
        lua/playlist/katsomo.luac \
        lua/playlist/koreus.luac \
        lua/playlist/lelombrik.luac \
-       lua/playlist/megavideo.luac \
        lua/playlist/metacafe.luac \
        lua/playlist/metachannels.luac \
        lua/playlist/mpora.luac \
@@ -206,12 +193,32 @@ nobase_vlclib_DATA = \
        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 \
+       $(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)
@@ -223,7 +230,6 @@ EXTRA_DIST += \
        lua/intf/cli.lua \
        lua/intf/dummy.lua \
        lua/intf/dumpmeta.lua \
-       lua/intf/hotkeys.lua \
        lua/intf/http.lua \
        lua/intf/luac.lua \
        lua/intf/modules/common.lua \
@@ -259,7 +265,6 @@ EXTRA_DIST += \
        lua/playlist/katsomo.lua \
        lua/playlist/koreus.lua \
        lua/playlist/lelombrik.lua \
-       lua/playlist/megavideo.lua \
        lua/playlist/metacafe.lua \
        lua/playlist/metachannels.lua \
        lua/playlist/mpora.lua \
@@ -287,7 +292,6 @@ DIST_http_lua = \
        lua/http/dialogs/batch_window.html \
        lua/http/dialogs/error_window.html \
        lua/http/dialogs/browse_window.html \
-       lua/http/dialogs/.hosts \
        lua/http/dialogs/stream_window.html \
        lua/http/dialogs/offset_window.html \
        lua/http/dialogs/stream_config_window.html \
@@ -350,7 +354,6 @@ DIST_http_lua = \
        lua/http/mobile_browse.html \
        lua/http/favicon.ico \
        lua/http/mobile_view.html \
-       lua/http/.hosts \
        lua/http/requests/playlist.xml \
        lua/http/requests/playlist.json \
        lua/http/requests/README.txt \
@@ -378,6 +381,7 @@ DIST_http_lua = \
        lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
        lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
        lua/http/css/main.css \
+       lua/http/css/mobile.css \
        lua/http/js/jquery-1.5.1.min.js \
        lua/http/old/js/functions.js \
        lua/http/old/js/vlm.js \
@@ -388,21 +392,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