remove unneeded code

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cdc34dbdb8d1617c37200e4023530adac7946cc6..402803d96f37ccc80ea50406ee09413defbd97d5 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
@@ -418,7 +417,7 @@ VLC-release.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       REVISION=`git describe` && \
+       REVISION=`git describe --always` && \
        cat $(top_builddir)/extras/package/macosx/Info.plist | \
        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -585,7 +584,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       REVISION=`git describe` && \
+       REVISION=`git describe --always` && \
        cat $(top_builddir)/extras/package/macosx/Info.plist | \
        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -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)