youtube.lua: alternative way of fetching ArtURL

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 67d16f0ea8bb34352b10d62225cf666833037b7b..5e35330a1d2b8dcaa9049ec87a98ee9af3ad67e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/back.png \
        extras/package/macosx/Resources/mainwindow/bottom-background.png \
        extras/package/macosx/Resources/mainwindow/bottom-bar-mini.png \
+       extras/package/macosx/Resources/mainwindow/dropzone-background.png \
+       extras/package/macosx/Resources/mainwindow/dropzone.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons.png \
@@ -245,7 +247,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/volume-low.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
-       extras/package/macosx/Resources/mainwindow/volumetrack.png \
        extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
@@ -306,6 +307,13 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
        extras/package/macosx/Resources/shuffle_embedded.png \
        extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png \
+       extras/package/macosx/Resources/sidebar-icons/film-cast.png \
+       extras/package/macosx/Resources/sidebar-icons/film.png \
+       extras/package/macosx/Resources/sidebar-icons/music-beam.png \
+       extras/package/macosx/Resources/sidebar-icons/network-cloud.png \
+       extras/package/macosx/Resources/sidebar-icons/picture.png \
+       extras/package/macosx/Resources/sidebar-icons/README \
        extras/package/macosx/Resources/skip_forward_active_embedded.png \
        extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
        extras/package/macosx/Resources/skip_previous_active_embedded.png \
@@ -345,6 +353,13 @@ EXTRA_DIST += \
        extras/misc/mpris.py \
        extras/misc/mpris.xml
 
+###############################################################################
+# Scripts for building dependencies.
+##############################################################################
+EXTRA_DIST += \
+       contrib/bootstrap \
+       contrib/src/
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -463,8 +478,6 @@ VLC-release.app: vlc
            applescript.m \
            controls.h \
            controls.m \
-           equalizer.h \
-           equalizer.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -599,8 +612,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            applescript.m \
            controls.h \
            controls.m \
-           equalizer.h \
-           equalizer.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -754,7 +765,7 @@ if !HAVE_WIN64
 if !HAVE_WINCE
        cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
-       cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
+       cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
 endif
@@ -795,7 +806,7 @@ package-win32-webplugin-common: package-win-base
        mkdir -p "$(win32_xpi_destdir)/plugins"
        find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+       cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
 endif
        cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
        cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
@@ -804,13 +815,13 @@ endif
 
 package-win32-xpi: package-win32-webplugin-common
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)"
+       cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)"
        cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 endif
 
 package-win32-crx: package-win32-webplugin-common
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)"
+       cp $(top_builddir)/npapi-vlc/npapi/manifest.json "$(win32_xpi_destdir)"
        crxmake --pack-extension "$(win32_xpi_destdir)" \
                --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 endif