Get rid of ligcrypt M4 macros

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c69a742c8fc3bc2484e809b9c0013edb8580bb5e..4d16422741a9316614a75370c81368946f74336e 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
@@ -22,7 +23,7 @@ SUBDIRS = po compat src
 if LOADER
 SUBDIRS += libs/loader
 endif
-if HAVE_LIBGCRYPT
+if HAVE_GCRYPT
 SUBDIRS += libs/srtp
 endif
 if HAVE_ZLIB
@@ -415,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
@@ -491,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
@@ -577,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
@@ -644,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
@@ -765,6 +766,13 @@ package-win32-base-debug: package-win-common
 # Contrib *.dll's
        cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
 
+#Enable DEP and ASLR for all the binaries
+if USE_PEFLAGS
+       find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
+       $(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \
+       done
+endif
+
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
        mkdir -p "$(win32_lua_destdir)/http/images"