Remove stray declarations

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 44057f0372365b7397df7551c446c837379373f8..7f7902391c9aa3b0891b20f62749397755039f9a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,6 +198,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/forward.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \
+       extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png \
+       extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-left.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-middle.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-right.png \
@@ -231,6 +233,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/shuffle.png \
        extras/package/macosx/Resources/mainwindow/stop-pressed.png \
        extras/package/macosx/Resources/mainwindow/stop.png \
+       extras/package/macosx/Resources/mainwindow/topbar_background.png \
        extras/package/macosx/Resources/mainwindow/volume-high.png \
        extras/package/macosx/Resources/mainwindow/volume-low.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
@@ -239,6 +242,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \
+       extras/package/macosx/Resources/mainwindow_dark/bottomdark-left.png \
+       extras/package/macosx/Resources/mainwindow_dark/bottomdark-right.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \
@@ -248,6 +253,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/pause_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark.png \
@@ -284,8 +291,8 @@ EXTRA_DIST += \
        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-over.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 \
@@ -299,11 +306,11 @@ EXTRA_DIST += \
        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-graphite.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 \
@@ -354,6 +361,9 @@ EXTRA_DIST += \
        extras/package/macosx/eyetvplugin/eyetvplugin.h \
        extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
        extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
+       extras/package/macosx/eyetvplugin/EyeTV_Plugin_Installer.pmdoc/01vlc-contents.xml \
+       extras/package/macosx/eyetvplugin/EyeTV_Plugin_Installer.pmdoc/01vlc.xml \
+       extras/package/macosx/eyetvplugin/EyeTV_Plugin_Installer.pmdoc/index.xml \
        extras/package/macosx/README.MacOSX.rtf \
        extras/package/macosx/Info.plist.in
 
@@ -376,7 +386,7 @@ EXTRA_DIST += \
 ##############################################################################
 EXTRA_DIST += \
        contrib/bootstrap \
-       contrib/src/
+       contrib/src
 
 ###############################################################################
 # Building libvlc
@@ -449,6 +459,7 @@ vlc$(EXEEXT):
 ###############################################################################
 install-exec-hook:
        if test "$(build)" = "$(host)"; then \
+               PATH="$(DESTDIR)$(bindir):$$PATH" \
                LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
                "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
                         "$(DESTDIR)$(vlclibdir)/plugins" ; \
@@ -456,6 +467,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