X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=4d16422741a9316614a75370c81368946f74336e;hb=410a3de5b3690091f267f344f4c1fb182bfaed06;hp=7650b1427e57ed7b3ebe23ba7195f8919c26597d;hpb=a8f418d417f4dc3f08318c579637d86e9c943b34;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 7650b1427e..4d16422741 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,12 @@
 # Automake targets and declarations
 ###############################################################################
 
+# Pass --quiet to make when we are not verbose.
+AM_MAKEFLAGS = $(makesilentflags_$(V))
+makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY))
+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
 # which have makefiles with distribution information.
@@ -17,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
@@ -70,7 +76,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-fast-install \
 	--disable-dbus \
 	--disable-dvd --disable-mad --disable-libmpeg2 \
-	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+	--disable-ffmpeg --disable-faad --disable-skins2 \
 	--disable-live555 \
 	--disable-fribidi --disable-glx
 
@@ -109,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 \
@@ -319,7 +324,7 @@ CLEANFILES = $(BUILT_SOURCES_clean)
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 MAINTAINERCLEANFILES = ChangeLog
 
-# Shortcut for developpers to rebuild the core (libvlc + vlc)
+# Shortcut for developers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libcompat:
@@ -370,7 +375,7 @@ endif
 # Building aliases
 ###############################################################################
 
-ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc
+ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc
 bin_SCRIPTS = $(ALIASES)
 CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
@@ -388,9 +393,6 @@ rvlc: make-alias Makefile
 svlc: make-alias Makefile
 	$(MKALIAS) skins2
 
-wxvlc: make-alias Makefile
-	$(MKALIAS) wx
-
 qvlc: make-alias Makefile
 	$(MKALIAS) qt4
 
@@ -414,10 +416,16 @@ noinst_DATA = VLC.app
 endif
 endif
 
+silentstd = $(silentstd_$(V))
+silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY))
+silentstd_0 = 2>&1 >/dev/null
+# '__' prefix trick for old automake version.
+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 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
@@ -431,6 +439,8 @@ VLC-release.app: vlc
 	for i in AUTHORS COPYING THANKS; do \
 	  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
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -471,8 +481,6 @@ VLC-release.app: vlc
 	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
-	    update.h \
-	    update.m \
 	    coredialogs.h \
 	    coredialogs.m \
 	    embeddedwindow.h \
@@ -483,10 +491,10 @@ VLC-release.app: vlc
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC-release.app; \
+	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
+        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
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
 	PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -570,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
@@ -584,6 +592,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	for i in AUTHORS COPYING THANKS; do \
 	  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
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -624,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 \
@@ -636,10 +644,10 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC.app
+	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
+	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
 	touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -758,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"
@@ -887,30 +902,17 @@ package-win-common-strip: package-win32-base-debug
 	for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
       do if test -n "$$i" ; then \
       $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
-      $(OBJCOPY) --strip-debug "$$i" ; \
+      $(OBJCOPY) --strip-all "$$i" ; \
       $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
 	  mv "$$i.dbg" "$(win32_debugdir)"; \
     fi; done
 
-if BUILD_MOZILLA
-	$(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg"
-	$(OBJCOPY) --strip-debug "$(npvlc)"
-	$(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)"
-	mv "$(npvlc).dbg" "$(win32_debugdir)"
-endif
-if BUILD_ACTIVEX
-	$(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg"
-	$(OBJCOPY) --strip-debug "$(axvlc)"
-	$(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)"
-	mv "$(axvlc).dbg" "$(win32_debugdir)"
-endif
-
 #strip all plugins dll
 package-win32-base: package-win-common-strip
 	for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \
 	  do if test -n "$$i" ; then \
 	  $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
-	  $(OBJCOPY) --strip-debug "$$i" ; \
+	  $(OBJCOPY) --strip-all "$$i" ; \
 	  $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
 	  mv "$$i.dbg" "$(win32_debugdir)"; \
 	fi ; done
@@ -1132,6 +1134,7 @@ if BUILD_MOZILLA
 # Create Installer
 	rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
 	mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+	rm -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib" 
 	cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
 	rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
 	export PACKAGEMAKER=