Linux: parse /proc/cpuinfo instead of playing fork tricks

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c3e9008efec98afe17b8fe76d98cc843e76bae88..c34b99eab54a2a93fb5b4ab10bfa76fc0fa5ed21 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -275,19 +275,53 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/shuffle_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/stop-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/stop_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-close.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-on-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom.png \
+       extras/package/macosx/Resources/mainwindow_dark/topbar-dark-center-fill.png \
+       extras/package/macosx/Resources/mainwindow_dark/topbar-dark-left.png \
+       extras/package/macosx/Resources/mainwindow_dark/topbar-dark-right.png \
        extras/package/macosx/Resources/mainwindow_dark/volume-high_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/volume-low_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/volume-slider-knob_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/volume-slider-track_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-close-on.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-close-over.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-close.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-minimize-on.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-minimize-over.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-minimize.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-zoom-on.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-zoom-over.png \
-       extras/package/macosx/Resources/mainwindow_dark/window-zoom.png \
+       extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png \
+       extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png \
+       extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png \
+       extras/package/macosx/Resources/mainwindow_dark/window-resize.png \
        extras/package/macosx/Resources/noart.png \
        extras/package/macosx/Resources/prefs/spref_cone_Audio_64.png \
        extras/package/macosx/Resources/prefs/spref_cone_Hotkeys_64.png \
@@ -296,12 +330,12 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/prefs/spref_cone_Subtitles_64.png \
        extras/package/macosx/Resources/prefs/spref_cone_Video_64.png \
        extras/package/macosx/Resources/README \
-       extras/package/macosx/Resources/sidebar-icons/local.png \
-       extras/package/macosx/Resources/sidebar-icons/movie.png \
-       extras/package/macosx/Resources/sidebar-icons/music.png \
-       extras/package/macosx/Resources/sidebar-icons/pictures.png \
-       extras/package/macosx/Resources/sidebar-icons/playlist.png \
-       extras/package/macosx/Resources/sidebar-icons/podcast.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-local.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-movie.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-music.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-pictures.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-playlist.png \
+       extras/package/macosx/Resources/sidebar-icons/sidebar-podcast.png \
        extras/package/macosx/Resources/vlc.scriptSuite \
        extras/package/macosx/Resources/vlc.scriptTerminology \
        extras/package/macosx/fullscreen_panel.svg \
@@ -422,6 +456,9 @@ install-exec-hook:
                echo "Cross-compilation: cache generation skipped!" ; \
        fi
 
+uninstall-hook:
+       rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
+
 silentstd = $(silentstd_$(V))
 silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null