Win32: add asInvoker to manifest

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1689514b31ae75bc1479262206881ac45542c877..43186dd0a0032765ab4729ffc743112942baf65e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@
 # Pass --quiet to make when we are not verbose.
 AM_MAKEFLAGS = $(makesilentflags_$(V))
 makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY))
-makesilentflags__0 = --quiet
+makesilentflags_0 = --quiet
+makesilentflags__0 = $(makesilentflags_0)
 
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
@@ -114,13 +115,12 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/Extended.nib/designable.nib \
        extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/Update.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \
        extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \
        extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
+       extras/package/macosx/Resources/dsa_pub.pem \
        extras/package/macosx/Resources/aiff.icns \
        extras/package/macosx/Resources/audio.icns \
        extras/package/macosx/Resources/avi.icns \
@@ -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
@@ -481,8 +481,6 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            coredialogs.h \
            coredialogs.m \
            embeddedwindow.h \
@@ -494,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
@@ -580,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
@@ -636,8 +634,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            coredialogs.h \
            coredialogs.m \
            embeddedwindow.h \
@@ -649,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