# HG changeset patch # User diego # Date 1320695678 0 # Node ID 4ec96d5d2e4ccf3a7f3dd33b55d8dd6f110ca62e # Parent 7d06c9c40c2be90523dc629281226d978f5aa3c2 build: drop releaseclean target The target is supposed to remove files that are created during the XML build process without removing the generated documentation. Unfortunately, it does not work as expected and is not worth the extra complication. diff -r 7d06c9c40c2b -r 4ec96d5d2e4c DOCS/tech/release-howto.txt --- a/DOCS/tech/release-howto.txt Mon Nov 07 19:54:36 2011 +0000 +++ b/DOCS/tech/release-howto.txt Mon Nov 07 19:54:38 2011 +0000 @@ -18,8 +18,7 @@ - check out FFmpeg subdirs - remove obsolete DOCS translations, help files -- build the HTML docs from XML sources, then clean up: - make html-chunked; make releaseclean +- build the HTML docs from XML sources, then clean up release the tree: cd .. diff -r 7d06c9c40c2b -r 4ec96d5d2e4c DOCS/xml/Makefile --- a/DOCS/xml/Makefile Mon Nov 07 19:54:36 2011 +0000 +++ b/DOCS/xml/Makefile Mon Nov 07 19:54:38 2011 +0000 @@ -39,12 +39,8 @@ clean: -rm -rf $(HTML) -# Remove generated files but keep the HTML (for release tarballs). -releaseclean: - -rm -f $(CONFIGURE_GENERATED) - -rm -f $(MAIN_XML_ALL) - -distclean: clean releaseclean +distclean: clean + -rm -f $(CONFIGURE_GENERATED) $(MAIN_XML_ALL) .PHONY: all html-chunked html-single xmllint .PHONY: html-chunked-* html-single-* xmllint-* *clean diff -r 7d06c9c40c2b -r 4ec96d5d2e4c debian/rules --- a/debian/rules Mon Nov 07 19:54:36 2011 +0000 +++ b/debian/rules Mon Nov 07 19:54:38 2011 +0000 @@ -150,9 +150,7 @@ clean: dh_testdir dh_testroot - -test ! -f config.mak || ( $(MAKE) -C DOCS/xml releaseclean ; $(MAKE) distclean ) - # in case the previous command fails for some reason, remove 'svn ignored' files - rm -rf DOCS/HTML DOCS/codecs-status.html + -test -f config.mak && $(MAKE) distclean # Build architecture-independent packages binary-indep: install-indep