X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=43186dd0a0032765ab4729ffc743112942baf65e;hb=43ee24810c7130a8214e65e0a55f568675215548;hp=b54f4bf521a78cd83cf44cf2559a65733fa74c41;hpb=bf4626a0c967af6f4063187fd311067c62fc19e8;p=vlc diff --git a/Makefile.am b/Makefile.am index b54f4bf521..43186dd0a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -416,16 +416,16 @@ noinst_DATA = VLC.app endif endif -xcodebuild_FLAGS = $(xcodebuildsilentflags_$(V)) -xcodebuildsilentflags_ = $(xcodebuildsilentflags__$(AM_DEFAULT_VERBOSITY)) -xcodebuildsilentflags_0 = 2>&1 >/dev/null +silentstd = $(silentstd_$(V)) +silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY)) +silentstd_0 = 2>&1 >/dev/null # '__' 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 # use package-macosx to get a nice dmg VLC-release.app: vlc - ( cd src && $(MAKE) $(AM_MAKEFLAGS) install ) + ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) ) rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app @@ -492,7 +492,7 @@ VLC-release.app: vlc $(top_builddir)/tmp/modules/gui/macosx; \ done $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ - xcodebuild -target vlc $(xcodebuild_FLAGS) && \ + xcodebuild -target vlc $(silentstd) && \ cd ../../../../ && \ cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp @@ -578,7 +578,7 @@ VLC-release.app: vlc # This is just for development purposes. # 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 - (cd src && make install) + $(AM_V_GEN)(cd src && make install $(silentstd)) rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app @@ -645,7 +645,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib $(top_builddir)/tmp/modules/gui/macosx; \ done $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ - xcodebuild -target vlc $(xcodebuild_FLAGS) && \ + xcodebuild -target vlc $(silentstd) && \ cd ../../../../ && \ cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS