raop: handle VLC_ADD_LIBS

[vlc] / share / Makefile.am

diff --git a/share/Makefile.am b/share/Makefile.am
index e21667e312b4b2755301d6bf7522ba7328922d05..b5d9dcd6abc1ddbcbfff380ca6ecd376f1c45163 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,22 +2,29 @@ CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 EXTRA_DIST =
 
-iconsdatadir = $(datadir)/icons/hicolor/
-icons16dir = $(iconsdatadir)/16x16/apps/
-icons32dir = $(iconsdatadir)/32x32/apps/
-icons48dir = $(iconsdatadir)/48x48/apps/
-icons128dir = $(iconsdatadir)/128x128/apps/
-icons256dir = $(iconsdatadir)/256x256/apps/
-
-appdatadir = /usr/share/applications
+appdatadir = $(datadir)/applications
+if !HAVE_WIN32
+if !HAVE_WINCE
 appdata_DATA = vlc.desktop
+endif
+endif
 EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
 vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > $@.tmp
-       $(AM_V_at)mv -f $@.tmp $@
+       $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+       $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+       $(AM_V_at)mv -f tmp-$@ $@
 
+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 \
@@ -31,6 +38,8 @@ nobase_dist_vlcdata_SCRIPTS = \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
+endif
+endif
 
 EXTRA_DIST += \
        $(skins2_default_vlt_FILES) \
@@ -166,6 +175,7 @@ nobase_vlclib_DATA = \
        lua/playlist/canalplus.luac \
        lua/playlist/cue.luac \
        lua/playlist/dailymotion.luac \
+       lua/playlist/extreme.luac \
        lua/playlist/france2.luac \
        lua/playlist/googlevideo.luac \
        lua/playlist/jamendo.luac \
@@ -180,8 +190,10 @@ nobase_vlclib_DATA = \
        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/playlist/zapiks.luac \
        lua/sd/fmc.luac \
        lua/sd/freebox.luac \
        lua/sd/icecast.luac \
@@ -234,6 +246,7 @@ EXTRA_DIST += \
        lua/playlist/canalplus.lua \
        lua/playlist/cue.lua \
        lua/playlist/dailymotion.lua \
+       lua/playlist/extreme.lua \
        lua/playlist/france2.lua \
        lua/playlist/googlevideo.lua \
        lua/playlist/jamendo.lua \
@@ -248,8 +261,10 @@ EXTRA_DIST += \
        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/playlist/zapiks.lua \
        lua/sd/README.txt \
        lua/sd/fmc.lua \
        lua/sd/freebox.lua \