]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
Freetype: better shortext for Text Opacity
[vlc] / share / Makefile.am
index 29a7b41305cdddad0b09963d578a8f5dd60b19ef..96d4748a4d6c98861c680bbe846e83da853da043 100644 (file)
@@ -1,17 +1,30 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
+EXTRA_DIST =
 
-appdatadir = $(datadir)/applications/
+appdatadir = $(datadir)/applications
+if !HAVE_WIN32
+if !HAVE_WINCE
+appdata_DATA = vlc.desktop
+endif
+endif
+EXTRA_DIST += vlc.desktop.in
+CLEANFILES += $(appdata_DATA)
 
-iconsdatadir = $(datadir)/icons/hicolor/
-icons16dir = $(iconsdatadir)/16x16/apps/
-icons32dir = $(iconsdatadir)/32x32/apps/
-icons48dir = $(iconsdatadir)/48x48/apps/
-icons128dir = $(iconsdatadir)/128x128/apps/
-icons256dir = $(iconsdatadir)/256x256/apps/
+vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
+       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+       $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+       $(AM_V_at)mv -f tmp-$@ $@
 
-dist_appdata_DATA = vlc.desktop
+iconsdatadir = $(datadir)/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+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 \
@@ -25,8 +38,10 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
+endif
+endif
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
        $(DIST_rsrc) \
        $(DIST_skins2) \
@@ -149,6 +164,7 @@ nobase_vlclib_DATA = \
        lua/meta/art/01_googleimage.luac \
        lua/meta/fetcher/tvrage.luac \
        lua/meta/reader/filename.luac \
+       lua/modules/dkjson.luac \
        lua/modules/sandbox.luac \
        lua/modules/simplexml.luac \
        lua/playlist/anevia_streams.luac \
@@ -184,6 +200,7 @@ nobase_vlclib_DATA = \
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
        lua/intf/http.luac \
+       lua/intf/modules/httprequests.luac \
        $(NULL)
 nobase_vlcdata_DATA += $(DIST_http_lua)
 endif
@@ -203,6 +220,7 @@ EXTRA_DIST += \
        lua/intf/luac.lua \
        lua/intf/modules/common.lua \
        lua/intf/modules/host.lua \
+       lua/intf/modules/httprequests.lua \
        lua/intf/telnet.lua \
        lua/meta/art/README.txt \
        lua/meta/art/04_musicbrainz.lua \
@@ -213,6 +231,7 @@ EXTRA_DIST += \
        lua/meta/fetcher/tvrage.lua \
        lua/meta/reader/README.txt \
        lua/meta/reader/filename.lua \
+       lua/modules/dkjson.lua \
        lua/modules/sandbox.lua \
        lua/modules/simplexml.lua \
        lua/playlist/README.txt \
@@ -248,118 +267,114 @@ EXTRA_DIST += \
        lua/sd/metachannels.lua
 
 DIST_http_lua = \
-       lua/http/.hosts \
-       lua/http/css/main.css \
-       lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \
-       lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
-       lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
-       lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
-       lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
-       lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
-       lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
-       lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
-       lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
-       lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
-       lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \
-       lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
-       lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
-       lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
-       lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
-       lua/http/custom.lua \
-       lua/http/dialogs/.hosts \
-       lua/http/dialogs/browse \
-       lua/http/dialogs/browse_window.html \
+       lua/http/view.html \
+       lua/http/mobile.html \
        lua/http/dialogs/create_stream.html \
-       lua/http/dialogs/footer \
-       lua/http/dialogs/input \
-       lua/http/dialogs/main \
-       lua/http/dialogs/mosaic \
+       lua/http/dialogs/equalizer_window.html \
        lua/http/dialogs/mosaic_window.html \
-       lua/http/dialogs/offset_window.html \
-       lua/http/dialogs/playlist \
-       lua/http/dialogs/sout \
+       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/vlm \
-       lua/http/favicon.ico \
-       lua/http/flash.html
+       lua/http/dialogs/offset_window.html \
+       lua/http/dialogs/stream_config_window.html \
+       lua/http/dialogs/old/browse \
+       lua/http/dialogs/old/footer \
+       lua/http/dialogs/old/input \
+       lua/http/dialogs/old/main \
+       lua/http/dialogs/old/playlist \
+       lua/http/dialogs/old/sout \
+       lua/http/dialogs/old/vlm \
+       lua/http/custom.lua \
+       lua/http/vlm.html \
+       lua/http/old/images/loop.png \
+       lua/http/images/buttons.png \
+       lua/http/images/speaker-32.png \
+       lua/http/old/images/fullscreen.png \
+       lua/http/images/vlc-48.png \
+       lua/http/old/images/prev.png \
+       lua/http/old/images/play.png \
        lua/http/images/Audio-48.png \
-       lua/http/images/Back-48.png \
-       lua/http/images/button_eject-48.png \
-       lua/http/images/button_ffw-48.png \
-       lua/http/images/button_first-48.png \
-       lua/http/images/button_full-48.png \
-       lua/http/images/button_help-48.png \
-       lua/http/images/button_last-48.png \
-       lua/http/images/button_pause-48.png \
-       lua/http/images/button_play-48.png \
-       lua/http/images/button_rec-48.png \
-       lua/http/images/button_repeat-48.png \
-       lua/http/images/button_rew-48.png \
-       lua/http/images/button_stop-48.png \
-       lua/http/images/button_stream-48.png \
-       lua/http/images/delete.png \
-       lua/http/images/delete_small.png \
-       lua/http/images/eject.png \
-       lua/http/images/empty.png \
+       lua/http/old/images/empty.png \
+       lua/http/old/images/minus.png \
+       lua/http/old/images/slider_right.png \
+       lua/http/old/images/slider_point.png \
+       lua/http/old/images/pause.png \
+       lua/http/old/images/speaker_mute.png \
+       lua/http/old/images/delete_small.png \
+       lua/http/old/images/snapshot.png \
        lua/http/images/Folder-48.png \
-       lua/http/images/fullscreen.png \
-       lua/http/images/help.png \
-       lua/http/images/info.png \
-       lua/http/images/loop.png \
-       lua/http/images/minus.png \
-       lua/http/images/next.png \
+       lua/http/old/images/info.png \
+       lua/http/old/images/refresh.png \
+       lua/http/old/images/sout.png \
+       lua/http/old/images/sort.png \
+       lua/http/old/images/white_cross_small.png \
+       lua/http/old/images/shuffle.png \
        lua/http/images/Other-48.png \
-       lua/http/images/pause.png \
-       lua/http/images/play.png \
-       lua/http/images/playlist.png \
-       lua/http/images/playlist_small.png \
-       lua/http/images/plus.png \
-       lua/http/images/prev.png \
-       lua/http/images/refresh.png \
-       lua/http/images/repeat.png \
-       lua/http/images/reset.png \
-       lua/http/images/sd.png \
-       lua/http/images/shuffle.png \
-       lua/http/images/slider_bar.png \
-       lua/http/images/slider_left.png \
-       lua/http/images/slider_point.png \
-       lua/http/images/slider_right.png \
-       lua/http/images/snapshot.png \
-       lua/http/images/slow.png \
-       lua/http/images/sort.png \
-       lua/http/images/sout.png \
-       lua/http/images/speaker-32.png \
-       lua/http/images/speaker.png \
-       lua/http/images/speaker_mute.png \
-       lua/http/images/stop.png \
+       lua/http/old/images/repeat.png \
+       lua/http/old/images/slow.png \
+       lua/http/old/images/slider_left.png \
+       lua/http/old/images/help.png \
+       lua/http/old/images/stop.png \
+       lua/http/old/images/sd.png \
+       lua/http/old/images/speaker.png \
+       lua/http/old/images/delete.png \
+       lua/http/images/Back-48.png \
        lua/http/images/Video-48.png \
+       lua/http/old/images/playlist_small.png \
+       lua/http/old/images/eject.png \
+       lua/http/old/images/playlist.png \
+       lua/http/old/images/volume_up.png \
+       lua/http/old/images/next.png \
+       lua/http/old/images/volume_down.png \
+       lua/http/old/images/slider_bar.png \
        lua/http/images/vlc16x16.png \
-       lua/http/images/volume_down.png \
-       lua/http/images/volume_up.png \
-       lua/http/images/white.png \
-       lua/http/images/white_cross_small.png \
+       lua/http/old/images/plus.png \
+       lua/http/old/images/white.png \
+       lua/http/old/images/reset.png \
+       lua/http/mobile_equalizer.html \
+       lua/http/vlm_export.html \
+       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 \
+       lua/http/requests/playlist_jstree.xml \
+       lua/http/requests/browse.xml \
+       lua/http/requests/browse.json \
+       lua/http/requests/vlm_cmd.xml \
+       lua/http/requests/status.xml \
+       lua/http/requests/status.json \
+       lua/http/requests/vlm.xml \
        lua/http/index.html \
-       lua/http/js/common.js \
-       lua/http/js/controlers.js \
-       lua/http/js/functions.js \
+       lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css \
+       lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png \
+       lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png \
+       lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png \
+       lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
+       lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png \
+       lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png \
+       lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png \
+       lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
+       lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
+       lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
+       lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png \
+       lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png \
+       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/js/jquery-1.5.1.min.js \
+       lua/http/old/js/functions.js \
+       lua/http/old/js/vlm.js \
+       lua/http/js/ui.js \
+       lua/http/js/common.js \
        lua/http/js/jquery.jstree.js \
+       lua/http/js/controlers.js \
        lua/http/js/jquery-ui-1.8.13.custom.min.js \
-       lua/http/js/mosaic.js \
-       lua/http/js/vlm.js \
-       lua/http/mosaic.html \
-       lua/http/requests/browse.xml \
-       lua/http/requests/equalizer.xml \
-       lua/http/requests/playlist.xml \
-       lua/http/requests/status.xml \
-       lua/http/requests/vlm.xml \
-       lua/http/requests/vlm_cmd.xml \
-       lua/http/requests/README.txt \
-       lua/http/style.css \
-       lua/http/iehacks.css \
-       lua/http/view.html \
-       lua/http/vlm.html \
-       lua/http/vlm_export.html
+       lua/http/old/style.css
 
 DIST_maemo = \
        maemo/vlc_intf.rc \