DirectX aout: select the output device by its name instead of its number in preferences

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 26cf733d2c3e1782e829e089bef8eceb1a69d40b..e28142fa9b3921ca01376103c999c87e155dbd51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,9 +357,9 @@ vlc-bundle: vlc
            cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
          fi ; \
        done
-       if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
+       if test -d $(CONTRIB_DIR)/vlc-lib ; then \
          mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-         for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
+         for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
            cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
          done ; \
        fi
@@ -440,7 +440,7 @@ VLC-release.app: vlc
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
-       cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+       cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
        mkdir -p $(top_builddir)/tmp/modules/audio_output
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
@@ -593,7 +593,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
-       cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+       cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
        mkdir -p $(top_builddir)/tmp/modules/audio_output
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
@@ -706,7 +706,7 @@ package-win-common:
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
 
 # Copy Text files
-       for file in AUTHORS MAINTAINERS THANKS ; \
+       for file in AUTHORS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done;
        for file in NEWS COPYING README; \
          do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done
@@ -765,7 +765,7 @@ package-win32-base-debug: package-win-common
          fi ; done
 
 # Contrib *.dll's
-       cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+#      cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
 
 #Enable DEP and ASLR for all the binaries
 if USE_PEFLAGS
@@ -927,7 +927,7 @@ package-win32-base-exe: package-win32-base
        else \
            echo 'Error: cannot locate makensis tool'; exit 1; \
        fi; \
-       eval "$$MAKENSIS $(win32_destdir)/spad.nsi"
+       eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
        eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
 
 package-win32-base-zip: package-win32-base