xspf: silently skip unknown extension nodes (fix #3696)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index afa2d9504bfba16ec6f169a22cc470c9d2f541f9..0c4a146fafb96f94fea6163602896a116537b909 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = \
        extras/package/win32/languages/brazilian_portuguese.nsh \
        extras/package/win32/languages/bulgarian.nsh \
        extras/package/win32/languages/catalan.nsh \
-       extras/package/win32/languages/declaration.nsh \
+       extras/package/win32/languages/danish.nsh \
        extras/package/win32/languages/dutch.nsh \
        extras/package/win32/languages/english.nsh \
        extras/package/win32/languages/estonian.nsh \
@@ -73,8 +73,7 @@ EXTRA_DIST = \
        extras/package/win32/languages/slovak.nsh \
        extras/package/win32/languages/slovenian.nsh \
        extras/package/win32/languages/sorani.nsh \
-       extras/package/win32/languages/spanish.nsh \
-       extras/package/win32/languages/vlc-chinese_simp.nsh
+       extras/package/win32/languages/spanish.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 nodist_noinst_SCRIPTS = compile
@@ -99,7 +98,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-mad --disable-libmpeg2 \
        --disable-faad --disable-skins2 \
        --disable-live555 \
-       --disable-fribidi --disable-glx
+       --disable-fribidi --disable-glx \
+       --with-kde-solid='$${datadir}/kde4/apps'
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -737,7 +737,7 @@ package-win-common:
        $(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-       cp $(srcdir)/share/vlc.ico $(win32_destdir)/
+       cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
 
 # Copy the locales
        mkdir -p $(win32_destdir)/locale