X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=0f1146db87d74040c45f0d1007c1c3a6c892126d;hb=18aed9afae6069cec84ac2398fe76adb7f56d8d8;hp=43186dd0a0032765ab4729ffc743112942baf65e;hpb=bd36ded7307516a48315799be05c1d9449cbd15a;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 43186dd0a0..0f1146db87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,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
@@ -48,7 +48,6 @@ EXTRA_DIST = \
 	INSTALL.wince \
 	extras/package/win32/vlc.exe.manifest \
 	extras/package/win32/libvlc.dll.manifest \
-	MAINTAINERS \
 	extras/package/macosx/README.MacOSX.rtf \
 	vlc-config.in.in \
 	extras/package/rpm/vlc.fedora.spec \
@@ -432,7 +431,7 @@ VLC-release.app: vlc
 	for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
-	REVISION=`git describe --always` && \
+	REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -585,7 +584,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
-	REVISION=`git describe --always` && \
+	REVISION=`(git --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
@@ -766,6 +765,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"
@@ -884,7 +890,7 @@ endif
 	find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
 	rm -Rf vlc-$(VERSION)/sdk/bin
 
-#strip exe and main dll
+# Strip DLLs
 package-win-common-strip: package-win32-base-debug
 	@if test -e "$(win32_debugdir)"; then \
 	  echo "Error: please remove $(win32_debugdir), it is in the way"; \
@@ -892,23 +898,18 @@ package-win-common-strip: package-win32-base-debug
 	else \
 	  echo "OK."; mkdir -p "$(win32_debugdir)"; \
 	fi
-	for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
-      do if test -n "$$i" ; then \
-      $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
-      $(OBJCOPY) --strip-all "$$i" ; \
-      $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
-	  mv "$$i.dbg" "$(win32_debugdir)"; \
-    fi; done
-
-#strip all plugins dll
+	for i in "" $(win32_destdir)/*$(LIBEXT) \
+	            $(win32_destdir)/plugins/*$(LIBEXT) \
+	; do \
+	  if test -n "$$i" ; then \
+	    $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+	    $(OBJCOPY) --strip-all "$$i" ; \
+	    $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+	    mv "$$i.dbg" "$(win32_debugdir)"; \
+	  fi ; \
+	done
+
 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-all "$$i" ; \
-	  $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
-	  mv "$$i.dbg" "$(win32_debugdir)"; \
-	fi ; done
 
 package-win32-base-exe: package-win32-base
 # Create package
@@ -974,13 +975,14 @@ package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
 # Clean up
 	rm -Rf $(win32_destdir)
 
-package-wince-base: package-win-common package-win-common-strip
+package-wince-base: package-win-common-strip
 
-package-wince-base-zip:
+package-wince-base-zip: package-wince-base
 # Create package 
-	zip -r vlc-$(VERSION)-wince.zip vlc-$(VERSION)
+	rm -f -- vlc-$(VERSION)-wince.zip
+	zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
 
-package-wince: package-wince-base  package-wince-base-zip
+package-wince: package-wince-base-zip
 # Clean up
 	rm -Rf $(win32_destdir)