Fix Win32 build after osdmenu removal.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a17c64c35fec68a5c36d5a5e41bfb4eaa1ce32f..1ed65f28d1926cd81fc7b90a8c9950f496f1a785 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,6 @@ EXTRA_DIST = \
        extras/package/macosx/README.MacOSX.rtf \
        vlc-config.in.in \
        extras/package/rpm/vlc.fedora.spec \
-       extras/package/rpm/vlc.mandriva.spec \
        extras/package/rpm/vlc.altlinux.spec \
        extras/package/win32/vlc.win32.nsi.in \
        extras/package/win32/languages/declaration.nsh \
@@ -369,25 +368,25 @@ dist_noinst_SCRIPTS += make-alias
 
 MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
 
-cvlc: make-alias
+cvlc: make-alias Makefile
        $(MKALIAS) dummy
 
-rvlc: make-alias
+rvlc: make-alias Makefile
        $(MKALIAS) rc
 
-svlc: make-alias
+svlc: make-alias Makefile
        $(MKALIAS) skins2
 
-wxvlc: make-alias
+wxvlc: make-alias Makefile
        $(MKALIAS) wx
 
-qvlc: make-alias
+qvlc: make-alias Makefile
        $(MKALIAS) qt4
 
-nvlc: make-alias
+nvlc: make-alias Makefile
        $(MKALIAS) ncurses
 
-mvlc: make-alias
+mvlc: make-alias Makefile
        $(MKALIAS) maemo
 
 if BUILD_VLC
@@ -710,7 +709,7 @@ package-win-common:
        unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-       cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/
+       cp $(srcdir)/share/vlc.ico $(win32_destdir)/
 
 # Copy the locales
        mkdir -p $(win32_destdir)/locale
@@ -727,7 +726,7 @@ package-win-common:
 if BUILD_MOZILLA
        mkdir -p "$(win32_destdir)/mozilla"
        cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-       cp $(top_builddir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+       cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
 endif
 
 # ActiveX plugin
@@ -738,7 +737,7 @@ if BUILD_ACTIVEX
        unix2dos $(win32_destdir)/activex/*
 
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-       cp $(top_builddir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+       cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
@@ -868,9 +867,9 @@ if BUILD_OSDMENU
 #OSD Menu
        mkdir -p "$(win32_destdir)/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
-       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
+       for dir in default default/selected default/selection default/volume ;do \
                mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
-               for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \
+               for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
                         cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
                done; \
        done