]> git.sesse.net Git - vlc/blobdiff - share/Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ALSA: require alsa-lib on Linux by default if PulseAudio is missing
[vlc] / share / Makefile.am
diff --git a/share/Makefile.am b/share/Makefile.am
index 02be53dd0b33839dbd4997492a35ad8d1c53c1cd..0b8af945205f9c6d9393e2850537d32a0b5d1894 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -12,12 +12,13 @@ icons256dir = $(iconsdatadir)/256x256/apps/
 
 dist_appdata_DATA = vlc.desktop
 
-dist_vlcdata_DATA = vlc.ico
-dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
-dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
-dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
-dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
-dist_icons256_DATA = vlc256x256.png
+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 \
+                       icons/32x32/vlc-xmas.xpm
+dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-xmas.png
+dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-xmas.png
+dist_icons256_DATA = icons/256x256/vlc.png
 
 nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
@@ -29,11 +30,9 @@ EXTRA_DIST = \
        $(skins2_default_vlt_FILES) \
        $(DIST_rsrc) \
        $(DIST_skins2) \
-       $(DIST_http) \
        $(DIST_http_lua) \
        $(DIST_lua) \
        $(DIST_osdmenu_default) \
-       $(DIST_mozilla) \
        $(DIST_maemo) \
        $(DIST_solid)
 
@@ -42,17 +41,10 @@ if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_HTTPD
-nobase_vlcdata_DATA += $(DIST_http)
-endif
 if BUILD_OSDMENU
 nobase_vlcdata_DATA += \
        $(DIST_osdmenu_default)
 endif
-if BUILD_MOZILLA
-# TODO: move to the mozilla directory
-nobase_vlcdata_DATA += $(DIST_mozilla)
-endif
 if BUILD_HILDON
 nobase_vlcdata_DATA += $(DIST_maemo) $(maemo_FILES)
 endif
@@ -63,8 +55,7 @@ endif
 DIST_rsrc = \
        newres.h \
        resource.h \
-       vlc_wince_rc.rc \
-       vlc_beos.rsrc
+       vlc_wince_rc.rc
 
 DIST_skins2 = \
        skins2/fonts/FreeSans.ttf \
@@ -74,7 +65,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 \
@@ -87,73 +78,10 @@ skins2_default_vlt_FILES = \
 
 skins2/default.vlt: $(skins2_default_vlt_FILES)
        mkdir -p skins2
-       tar cvvzf skins2/default.vlt -C $(srcdir)/skins2 default/
-
-DIST_http = \
-       http/.hosts \
-       http/dialogs/.hosts \
-       http/dialogs/browse \
-       http/dialogs/footer \
-       http/dialogs/input \
-       http/dialogs/main \
-       http/dialogs/mosaic \
-       http/dialogs/playlist \
-       http/dialogs/sout \
-       http/dialogs/vlm \
-       http/favicon.ico \
-       http/images/delete.png \
-       http/images/delete_small.png \
-       http/images/eject.png \
-       http/images/empty.png \
-       http/images/fullscreen.png \
-       http/images/help.png \
-       http/images/info.png \
-       http/images/loop.png \
-       http/images/minus.png \
-       http/images/next.png \
-       http/images/pause.png \
-       http/images/play.png \
-       http/images/playlist.png \
-       http/images/playlist_small.png \
-       http/images/plus.png \
-       http/images/prev.png \
-       http/images/refresh.png \
-       http/images/repeat.png \
-       http/images/sd.png \
-       http/images/shuffle.png \
-       http/images/slider_bar.png \
-       http/images/slider_left.png \
-       http/images/slider_point.png \
-       http/images/slider_right.png \
-       http/images/snapshot.png \
-       http/images/slow.png \
-       http/images/sort.png \
-       http/images/sout.png \
-       http/images/speaker.png \
-       http/images/speaker_mute.png \
-       http/images/stop.png \
-       http/images/vlc16x16.png \
-       http/images/volume_down.png \
-       http/images/volume_up.png \
-       http/images/white.png \
-       http/images/white_cross_small.png \
-       http/index.html \
-       http/js/functions.js \
-       http/js/mosaic.js \
-       http/js/vlm.js \
-       http/mosaic.html \
-       http/requests/browse.xml \
-       http/requests/playlist.xml \
-       http/requests/status.xml \
-       http/requests/vlm.xml \
-       http/requests/vlm_cmd.xml \
-       http/requests/readme \
-       http/style.css \
-       http/iehacks.css \
-       http/vlm.html \
-       http/vlm_export.html \
-       http/flash.html
-
+       (cd "$(srcdir)/skins2"; find default -print0 | \
+               LC_ALL=C sort -z | \
+               tar cvv --exclude .svn --no-recursion --null -T -) | \
+       gzip -n > skins2/default.vlt
 DIST_osdmenu_default = \
        osdmenu/default.cfg \
        osdmenu/default/unselected.png \
@@ -207,19 +135,18 @@ luac_verbose_0 = @echo "  LUAC   $@";
 if BUILD_LUA
 nobase_vlclib_DATA = \
        lua/extensions/allocine-fr.luac \
-       lua/extensions/imdb.luac \
+       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 \
-       lua/intf/rc.luac \
        lua/intf/telnet.luac \
-       lua/meta/art/01_musicbrainz.luac \
+       lua/meta/art/04_musicbrainz.luac \
        lua/meta/art/02_frenchtv.luac \
        lua/meta/art/03_lastfm.luac \
-       lua/meta/art/10_googleimage.luac \
+       lua/meta/art/01_googleimage.luac \
        lua/meta/fetcher/tvrage.luac \
        lua/meta/reader/filename.luac \
        lua/modules/sandbox.luac \
@@ -241,18 +168,18 @@ nobase_vlclib_DATA = \
        lua/playlist/lelombrik.luac \
        lua/playlist/megavideo.luac \
        lua/playlist/metacafe.luac \
+       lua/playlist/metachannels.luac \
        lua/playlist/mpora.luac \
        lua/playlist/pinkbike.luac \
+       lua/playlist/pluzz.luac \
        lua/playlist/rockbox_fm_presets.luac \
-       lua/playlist/vimeo.luac \
        lua/playlist/youtube.luac \
        lua/playlist/youtube_homepage.luac \
-       lua/sd/appletrailers.luac \
        lua/sd/fmc.luac \
        lua/sd/freebox.luac \
-       lua/sd/frenchtv.luac \
        lua/sd/icecast.luac \
        lua/sd/jamendo.luac \
+       lua/sd/metachannels.luac \
        $(NULL)
 if BUILD_HTTPD
 nobase_vlclib_DATA += \
@@ -267,8 +194,8 @@ EXTRA_DIST += \
        lua/README.txt \
        lua/extensions/README.txt \
        lua/extensions/allocine-fr.lua \
-       lua/extensions/imdb.lua \
        lua/intf/README.txt \
+       lua/intf/cli.lua \
        lua/intf/dummy.lua \
        lua/intf/dumpmeta.lua \
        lua/intf/hotkeys.lua \
@@ -276,13 +203,12 @@ EXTRA_DIST += \
        lua/intf/luac.lua \
        lua/intf/modules/common.lua \
        lua/intf/modules/host.lua \
-       lua/intf/rc.lua \
        lua/intf/telnet.lua \
        lua/meta/art/README.txt \
-       lua/meta/art/01_musicbrainz.lua \
+       lua/meta/art/04_musicbrainz.lua \
        lua/meta/art/02_frenchtv.lua \
        lua/meta/art/03_lastfm.lua \
-       lua/meta/art/10_googleimage.lua \
+       lua/meta/art/01_googleimage.lua \
        lua/meta/fetcher/README.txt \
        lua/meta/fetcher/tvrage.lua \
        lua/meta/reader/README.txt \
@@ -307,19 +233,19 @@ EXTRA_DIST += \
        lua/playlist/lelombrik.lua \
        lua/playlist/megavideo.lua \
        lua/playlist/metacafe.lua \
+       lua/playlist/metachannels.lua \
        lua/playlist/mpora.lua \
        lua/playlist/pinkbike.lua \
+       lua/playlist/pluzz.lua \
        lua/playlist/rockbox_fm_presets.lua \
-       lua/playlist/vimeo.lua \
        lua/playlist/youtube.lua \
        lua/playlist/youtube_homepage.lua \
        lua/sd/README.txt \
-       lua/sd/appletrailers.lua \
        lua/sd/fmc.lua \
        lua/sd/freebox.lua \
-       lua/sd/frenchtv.lua \
        lua/sd/icecast.lua \
-       lua/sd/jamendo.lua
+       lua/sd/jamendo.lua \
+       lua/sd/metachannels.lua
 
 DIST_http_lua = \
        lua/http/.hosts \
@@ -381,27 +307,13 @@ DIST_http_lua = \
        lua/http/requests/status.xml \
        lua/http/requests/vlm.xml \
        lua/http/requests/vlm_cmd.xml \
-       lua/http/requests/readme \
+       lua/http/requests/README.txt \
        lua/http/style.css \
        lua/http/iehacks.css \
        lua/http/vlm.html \
        lua/http/vlm_export.html \
        lua/http/flash.html
 
-DIST_mozilla = \
-       mozilla/fullscreen.xpm \
-       mozilla/pause.xpm \
-       mozilla/play.xpm \
-       mozilla/skip_next.xpm \
-       mozilla/skip_previous.xpm \
-       mozilla/stop.xpm \
-       mozilla/time_icon.xpm \
-       mozilla/time_line.xpm \
-       mozilla/volume_knob.xpm \
-       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 \
@@ -414,7 +326,7 @@ DIST_maemo = \
        maemo/next.png
 
 maemo_FILES = \
-       vlc32x32.png
+       icons/32x32/vlc.png
 
 DIST_solid = \
        solid/vlc-opencda.desktop \
Unnamed repository; edit this file 'description' to name the repository.