From patchwork Tue Dec 19 14:31:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 181005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1979966dyi; Tue, 19 Dec 2023 06:34:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWoPH7anjcr8aCAY9qrCFXFSvlHshE/+hXyE6ZsUw6gL8nxLm4C54yVlCG0bDwptic9oSD X-Received: by 2002:a05:6122:3881:b0:4b6:df02:52e with SMTP id eo1-20020a056122388100b004b6df02052emr810510vkb.7.1702996482244; Tue, 19 Dec 2023 06:34:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702996482; cv=pass; d=google.com; s=arc-20160816; b=niAYDKWML2Rai4urEOSRJoHWrB8BCTBIjvnIybLsznd6FjGqo9ErqzqmZ4BC01O1YJ BDdV3gTmeUomdRivxh2LUsVSwY9V+KcPOsU5/66sDQ5J47ZIzitwB3UpFkiUvRPgRKUV 8BUrFAJU1oAmaj1qzG45LGpViIg+Gf3dAP4wTOzahh/87A+n/PDX8HrspfY8YHtohtYW fYKobCZhqeJqs+78ULHqajLWw6TIgkZ100Nt0h9M74Wqwr1Z0fT0XmcyaDzNu3/3k24D Glv+qQrUNoKU5TI+7COOxZujLgg9XdMtpXChXA43jw4+bjR25a9v0/x/vtk2xb/Uzs0R P80Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=SNFKUUt8C45nogNczF5GJ6K2UN2PO63pGZbYR6PBfA8=; fh=h98mFSi1RI9GUF1Fjw6Ymd7HVeAdKmNoVDxwAmFcsRg=; b=Qtxr+nAoZxBFK9cwtBmuWqqlWOYUMjfcxc/vsPauoY5YXSrp1bJ24WsDwpRKfjzMIt qHtG0349Xmxk2tieubFP5FQGSupZQ/mQ5JiamTijBC+oUTkmrfoFZuQBS7I6+L4VbYst RGW1EMXKcLTpYoz/NmTxdCu6D0LAbCpHvLLljshL8qpvpCLacykjRs3KC8vBWY4J63BB zWl+s05dY1cHy8wqwU9TrihhOTYGQM+YlZMZWsJdBz0oMgpSiN0UCb0DeDFbNgvnh8Db znVn8bbTrBzl34YO/7XniGh136RGSuqdcHe2yW8YcSjpzYJEGeZUvnxerzOH+u5KmODu zbNA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=FPRvlafC; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id 126-20020a1f1284000000b004b6e37dd53esi242673vks.182.2023.12.19.06.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 06:34:42 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@adacore.com header.s=google header.b=FPRvlafC; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=adacore.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E287738930D2 for ; Tue, 19 Dec 2023 14:32:25 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 2B8CE386182E for ; Tue, 19 Dec 2023 14:31:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2B8CE386182E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2B8CE386182E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702996276; cv=none; b=GQkd3xixWGUB2MTbaxTzzeuQupNkIR1aFbTvM8Yvj7FvMutQhU2GG5agZqxrHAv4smhEGNOl4b/8sqVJqewqoZarV/x3yAqA4rXuE1C6I1NDaSSu4NNz54zsaBUH+51WTJMuCCn9UsnsA4nt2l4ls24HCuXETiuPyIoplbkRRQg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702996276; c=relaxed/simple; bh=IFEpCmPzwsMve/97eo2XsSjBUGa2JM/T/PShNu5uyHA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=m87uOP2V8i09zWbJy7vLbB/1P3GICzazgWOPXCZ/IMXtfgNFV/5KgBRqbZVH54oIZu9fKLO6jGpQwSyJGAOW3fFdhQlrAfCp0EH/K2o3aHUcIUdRCd1J5y1HSWl7VWVgwnCKwjBSjrb9luVD6ZYCQHR65q1/nk/o0tAFwecxZP0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40c41b43e1eso58470185e9.1 for ; Tue, 19 Dec 2023 06:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1702996271; x=1703601071; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SNFKUUt8C45nogNczF5GJ6K2UN2PO63pGZbYR6PBfA8=; b=FPRvlafCpipSDB6xyhgcH5Toy6Pe3N9p2DctSZnSrOToMCwP89m9ZPtzSPDshCZ76s eaM0FNUQhUACTxtkLWMm+a4g4neu6qQwsZPG3dkdsT2VlMD8IPRII/PqmwjrkXVV3j+V C9YpXugdDzfwsW7exuJo3tSAVcN6Dzpmu7ZR7PBu7hSL+KcZDzttIfMuApv4cyVKt5o9 JUYzA/SJtSxFZvCcykdEeLdBW6vA3WoH0wqPrFlCmOc3K/j6YFqYmZenLlij+jZPUuEc MQsUuE2Gdy0fRYXMLkFrhpV8Z6VOTRIWkN5rAtuhDwOfnuDwZ6v2XqJ6On72/teLUOvW aL3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702996271; x=1703601071; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SNFKUUt8C45nogNczF5GJ6K2UN2PO63pGZbYR6PBfA8=; b=iJetCqX3UCiyMswvBmwg4jicb/0XWlUhgux+K5UBfowkRn38tktb9DOyH4AxL2Aw43 cKz8mBPQrpBt6Bfo5U0cCTwtfBNOscA/HoLMlRp+LxHSh7qDA8qWNO1gzdObl9/OBVHi 2CytPfXXRCXx006IdOpZ2yvv3+xa93UIhVqSEHsPerZKGLhDa5pETUAmgWIl33nkTKqE oKZ2XoL0fvX97Qgl9gCWRWUzi+zKW77Yxcl+7VZWjJFjWiRclFnh3VHH+9wBwuffp0n5 kVksyTP3rl2921cXVkwLdTjqiF3c+iIVW2i/bMFZOAPm27q7yqkWUwVWoh3mVPensEZY 3LPQ== X-Gm-Message-State: AOJu0Yx2f30yLDj1ruA7S9uH6gPQIDXACTUkq/UJ8F65v5Af2RNb+sKP fiYKnuwTiaiDDY/FUw701d8xnd0h4jlbe0dJkxI= X-Received: by 2002:a05:600c:474a:b0:40c:6ae0:8cf3 with SMTP id w10-20020a05600c474a00b0040c6ae08cf3mr3474682wmo.153.1702996270988; Tue, 19 Dec 2023 06:31:10 -0800 (PST) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:fe1e:443:c34f:edaa]) by smtp.gmail.com with ESMTPSA id r8-20020a05600c458800b0040b36050f1bsm3049557wmo.44.2023.12.19.06.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 06:31:10 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: =?utf-8?q?Marc_Poulhi=C3=A8s?= Subject: [COMMITTED] ada: Add makefile targets for building/installing html doc Date: Tue, 19 Dec 2023 15:31:09 +0100 Message-ID: <20231219143109.456243-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785721239404212351 X-GMAIL-MSGID: 1785721239404212351 Add the ada.html and ada.install-html targets so that we can build the html with `make html`. gcc/ada/ * gcc-interface/Make-lang.in (ada.html, ada.install-html): Add. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/Make-lang.in | 35 ++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 97830ee37f9..2cf0c6d0977 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -889,10 +889,6 @@ ada.install-pdf: $(ADA_PDFFILES) $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/gcc/$$f"; \ done -ada.html: - -ada.install-html: - doc/gnat_ugn.dvi: ada/gnat_ugn.texi \ $(gcc_docdir)/include/fdl.texi \ $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi @@ -917,6 +913,37 @@ doc/gnat_rm.pdf: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi \ doc/gnat-style.pdf: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi $(TEXI2PDF) -c -I $(abs_docdir)/include -o $@ $< +ADA_TEXI_FILES = \ + ada/gnat_rm.texi \ + ada/gnat_ugn.texi \ + $(gcc_docdir)/include/fdl.texi \ + $(gcc_docdir)/include/gpl_v3.texi \ + $(gcc_docdir)/include/gcc-common.texi \ + gcc-vers.texi + +$(build_htmldir)/ada/index.html: $(ADA_TEXI_FILES) + $(mkinstalldirs) $(@D) + rm -f $(@D)/* + $(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/ada -o $(@D) $< + +ada.html: $(build_htmldir)/ada/index.html +ada.install-html: $(build_htmldir)/ada + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)" + @for p in $(build_htmldir)/ada; do \ + if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ + f=$(html__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(mkinstalldirs) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(mkinstalldirs) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ + done + # Install hooks: # gnat1 is installed elsewhere as part of $(COMPILERS).