Commit bd36ded7 authored by Pierre's avatar Pierre

am: In non verbose be silent when we 'cd src && make install' in the VLC.app targets.

parent b41c2c0e
...@@ -416,16 +416,16 @@ noinst_DATA = VLC.app ...@@ -416,16 +416,16 @@ noinst_DATA = VLC.app
endif endif
endif endif
xcodebuild_FLAGS = $(xcodebuildsilentflags_$(V)) silentstd = $(silentstd_$(V))
xcodebuildsilentflags_ = $(xcodebuildsilentflags__$(AM_DEFAULT_VERBOSITY)) silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY))
xcodebuildsilentflags_0 = 2>&1 >/dev/null silentstd_0 = 2>&1 >/dev/null
# '__' prefix trick for old automake version. # '__' prefix trick for old automake version.
xcodebuildsilentflags__0 = $(xcodebuildsilentflags_0) silentstd__0 = $(silentstd_0)
# VLC-release.app for packaging and giving it to your friends # VLC-release.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg # use package-macosx to get a nice dmg
VLC-release.app: vlc VLC-release.app: vlc
( cd src && $(MAKE) $(AM_MAKEFLAGS) install ) ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
rm -Rf "$(top_builddir)/tmp" rm -Rf "$(top_builddir)/tmp"
mkdir -p "$(top_builddir)/tmp/extras/package/macosx" mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC-release.app rm -Rf $(top_builddir)/VLC-release.app
...@@ -492,7 +492,7 @@ VLC-release.app: vlc ...@@ -492,7 +492,7 @@ VLC-release.app: vlc
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
xcodebuild -target vlc $(xcodebuild_FLAGS) && \ xcodebuild -target vlc $(silentstd) && \
cd ../../../../ && \ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
...@@ -578,7 +578,7 @@ VLC-release.app: vlc ...@@ -578,7 +578,7 @@ VLC-release.app: vlc
# This is just for development purposes. # This is just for development purposes.
# The resulting VLC.app will only run in this tree. # The resulting VLC.app will only run in this tree.
VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
(cd src && make install) $(AM_V_GEN)(cd src && make install $(silentstd))
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
mkdir -p "$(top_builddir)/tmp/extras/package/macosx" mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
rm -Rf $(top_builddir)/VLC.app rm -Rf $(top_builddir)/VLC.app
...@@ -645,7 +645,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ...@@ -645,7 +645,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
xcodebuild -target vlc $(xcodebuild_FLAGS) && \ xcodebuild -target vlc $(silentstd) && \
cd ../../../../ && \ cd ../../../../ && \
cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment