Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751240AbdGOBw2 convert rfc822-to-8bit (ORCPT ); Fri, 14 Jul 2017 21:52:28 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:47790 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751131AbdGOBw0 (ORCPT ); Fri, 14 Jul 2017 21:52:26 -0400 Date: Fri, 14 Jul 2017 22:52:13 -0300 From: Mauro Carvalho Chehab To: Jim Davis Cc: Markus Heiser , Jani Nikula , Jonathan Corbet , Linux Doc Mailing List , Mauro Carvalho Chehab , "linux-kernel@vger.kernel.org org List" , David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen , linux-mtd@lists.infradead.org Subject: Re: [PATCH v2 00/53] Get rid of Docbook Message-ID: <20170714225213.0a6dba4f@vento.lan> In-Reply-To: References: <20170518112608.4f355068@lwn.net> <20170518200140.11982b12@vento.lan> <386A482A-26F9-4C82-871D-E03E9F6401D8@darmarit.de> Organization: Samsung X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3021 Lines: 100 Em Fri, 14 Jul 2017 16:15:23 -0700 Jim Davis escreveu: > On Thu, Jul 6, 2017 at 1:54 AM, Markus Heiser wrote: > > > 52b3f23 Docs: clean up some DocBook loose ends > > Speaking of minor loose ends, > > make SPHINXDIRS=userspace-api pdfdocs > > works -- though now that it's all sphinx, wouldn't just DIRS be better? -- and Hmm... I don't like the idea of just DIRS, as there are other paths used on Makefile (INSTALL_PATH, INSTALL_MOD_PATH, INSTALL_HDR_PATH). > > make DOCBOOKS=userspace-api pdfdocs > > still works too. But that generates all of the pdf files, and not > just the userspace-api.pdf. It will just ignore it. The same happens if you do: make FOO=bar htmldocs Yet, it could make sense to either warn or make it equivalent to SPHINXDIRS at the Documentation/Makefile. > And running now-dead targets like "make > ps" or "make sgmldocs" or "make mandocs" just returns with no output. Yeah. We need to get rid of those targets from Documentation/Makefile: sgmldocs: psdocs: mandocs: installmandocs: I guess the enclosed patch should do the trick. Thanks, Mauro - docs: Makefile: remove no-ops targets After removal of DocBook, those targets are bogus. Reported-by: Jim Davis Signed-off-by: Mauro Carvalho Chehab diff --git a/Documentation/Makefile b/Documentation/Makefile index a42320385df3..d75c00e3aadb 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -95,16 +95,6 @@ endif # HAVE_SPHINX # The following targets are independent of HAVE_SPHINX, and the rules should # work or silently pass without Sphinx. -# no-ops for the Sphinx toolchain -sgmldocs: - @: -psdocs: - @: -mandocs: - @: -installmandocs: - @: - cleandocs: $(Q)rm -rf $(BUILDDIR) $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean diff --git a/Documentation/translations/zh_CN/HOWTO b/Documentation/translations/zh_CN/HOWTO index 11be075ba5fa..5f6d09edc9ac 100644 --- a/Documentation/translations/zh_CN/HOWTO +++ b/Documentation/translations/zh_CN/HOWTO @@ -149,9 +149,7 @@ Linux内核代码中包含有大量的文档。这些文档对于学习如何与 核源码的主目录中使用以下不同命令将会分别生成PDF、Postscript、HTML和手册 页等不同格式的文档： make pdfdocs - make psdocs make htmldocs - make mandocs 如何成为内核开发者 diff --git a/Makefile b/Makefile index 547947ff87de..5db9c669e541 100644 --- a/Makefile +++ b/Makefile @@ -1459,7 +1459,7 @@ $(help-board-dirs): help-%: # Documentation targets # --------------------------------------------------------------------------- -DOC_TARGETS := xmldocs sgmldocs psdocs latexdocs pdfdocs htmldocs mandocs installmandocs epubdocs cleandocs linkcheckdocs +DOC_TARGETS := xmldocs latexdocs pdfdocs htmldocs epubdocs cleandocs linkcheckdocs PHONY += $(DOC_TARGETS) $(DOC_TARGETS): scripts_basic FORCE $(Q)$(MAKE) $(build)=Documentation $@