X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=b5cfbfc8d0f257a2228d1cecc1519c5fb48f9b38;hb=8bb130f321ba96f481f56be6b2b647d3a5b3f103;hp=1689514b31ae75bc1479262206881ac45542c877;hpb=8d8c4591de83a12f94e89c1f59c119608a306291;p=vlc diff --git a/Makefile.am b/Makefile.am index 1689514b31..b5cfbfc8d0 100644 --- 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 @@ -47,12 +48,12 @@ 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 \ extras/package/rpm/vlc.altlinux.spec \ extras/package/win32/vlc.win32.nsi.in \ + extras/package/win32/spad.nsi.in \ extras/package/win32/languages/declaration.nsh \ extras/package/win32/languages/english.nsh \ extras/package/win32/languages/french.nsh @@ -60,7 +61,7 @@ EXTRA_DIST = \ dist_noinst_SCRIPTS = bootstrap toolbox nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi +BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -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,23 +416,23 @@ 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 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/ @@ -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,14 +578,14 @@ 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 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/ @@ -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 @@ -710,7 +706,7 @@ package-win-common: cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" # Copy Text files - for file in AUTHORS MAINTAINERS THANKS ; \ + for file in AUTHORS THANKS ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done; for file in NEWS COPYING README; \ do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done @@ -757,6 +753,7 @@ package-win32-base-debug: package-win-common # Copy relevant files # Script installer cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" + cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" mkdir "$(win32_destdir)/languages" cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" @@ -768,7 +765,14 @@ package-win32-base-debug: package-win-common fi ; done # Contrib *.dll's - cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true +# 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 @@ -888,7 +892,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"; \ @@ -896,23 +900,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 @@ -928,6 +927,7 @@ package-win32-base-exe: package-win32-base else \ echo 'Error: cannot locate makensis tool'; exit 1; \ fi; \ + eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" package-win32-base-zip: package-win32-base @@ -978,13 +978,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)