From patchwork Sun Apr 7 19:10:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 88141 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 222B23858430 for ; Sun, 7 Apr 2024 19:11:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 018B73858D20 for ; Sun, 7 Apr 2024 19:10:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 018B73858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 018B73858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712517044; cv=none; b=sYj67DiKZdrWqqINLORD7w7HXA3lirNd1v5r8WWUvIecb4vFmcpgDIhh/woJbOe7hzW1F9+0YDJQuCuExXZmlZtWIt5Iz2akW06QVAplyKRVzH14Ox5fgZl3LsDCrtXbsz2/TkfDw4+VpNxtOZwhpvkq9znC5k79SznqvCCibC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712517044; c=relaxed/simple; bh=P12puCJ1ViLWY7KrrcElge37fvsFOB82WhCWXSaONZ4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=p0390+QIvXUA6NjwRapxMXA35Za4Z0i1UuUS3WjofM30uMfn59no91oYfzw9H2vRl2LPLU26NYK5vOEgeIctOlWQmGxl3ccenVwfr9yudN5PUAxd/kf7MMGNX/IpDyNouxgrHi8Sy9sMQVnMCuLRZFTmVWTRrhxuVBQkcLHpwEg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-6ea163eb437so296259a34.2 for ; Sun, 07 Apr 2024 12:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712517040; x=1713121840; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m8JA0vA6GftIuEBBmr/kFB3TVawJWlkRWbMo+JbQCik=; b=qc1DI9aMDqNu/FAvl4GxQRieFc4Vvyo3BCX94Jax2kIe4ebTcyXGvvAAFGJ4BxfrjD DDmp0Fq69qAhBoRD+r4bgvMwGQQ69nXwG2RjerengPuUS7No2CW1vv2TARjsNyBbxaqA +cO7d2gW+UaK1tMfzmL7fHoEohdFdrlSqnzVn2dpZiwixs86fQ+7i6umjPoLvT7NELvf xuJ4ykVwuVogy8SKJYKvHmcYQzgtZd2uBPy9dyAcbMj+CQDvXl+zE5v5cjcfBh/VdYG6 tdEo1Dss4diuFLFFpgUXsX58fYO5vOWggFXeyFXD1eqcgVdRJ7q7586FhgEv553jKCCQ Gr/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712517040; x=1713121840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m8JA0vA6GftIuEBBmr/kFB3TVawJWlkRWbMo+JbQCik=; b=eIDXTFmZc4PgduaxHIwCjS7DAbQwj1WhNUZjz1pFl5xtP8muA43Ufh/anZot4k22H+ Yf3blMyoE4UUGNy9PZBOaZ9LdU+8eq0qify5EVsOtLzUz7SuBCx6QXtjSjxKx8boeC7w Ot5KPNDkBoySwMAxgWwh7DvYXuqQPuGe56ygvJlErvFvODSSPGmY5DNUTHRkptkq82xC 4U0yXLLrPM0PFAY83ePC68ex0t7nc53FdzaedeEWGH49acEpf5FxXlIsYuqb5XoeSbrN m54igBkf3RNtDSWEOAPpALlePs54L3udZXnCU+ycCRHNqavA6s1Q+nI1ekvmiLYVgO8U sD+w== X-Gm-Message-State: AOJu0YymGDNP4eOmWCsCmQE0UJKkU65Ap/1GDNyj23+A7h+Bwbdyxbst WXO21p9YPF8+669cUvOomFMLpuBNEBfrsEgiml4oz03Hdeq6Bbt9PijcfCOcYMLCRoeqxfS5X8k N X-Google-Smtp-Source: AGHT+IGs+fCbKEdWqzsEvZJ8vUvbaB2PTU0vTbApGWfA+FNISn0pWYZQWddsYFHuKSAqTTpfiQVi1w== X-Received: by 2002:a05:6830:22c7:b0:6e6:fdfc:3818 with SMTP id q7-20020a05683022c700b006e6fdfc3818mr8125289otc.5.1712517040463; Sun, 07 Apr 2024 12:10:40 -0700 (PDT) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id r18-20020a056830449200b006ea16d35096sm176218otv.20.2024.04.07.12.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 12:10:40 -0700 (PDT) From: Christophe Lyon To: gdb-patches@sourceware.org Cc: Christophe Lyon Subject: [PATCH v2] gdb, gdbserver: Add missing install-dvi Makefile target Date: Sun, 7 Apr 2024 19:10:27 +0000 Message-Id: <20240407191027.118770-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 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, URIBL_BLACK 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org For some reason install-dvi is missing although other targets of the same family are present. This looks like an oversight. This enables calling 'make install-dvi' from the top-level build directory. Fix what looks like another oversight: include 'pdf' in 'all-doc' in gdb/doc/Makefile.in. Tested-By: Luis Machado --- gdb/Makefile.in | 2 +- gdb/data-directory/Makefile.in | 2 +- gdb/doc/Makefile.in | 19 +++++++++++++++++-- gdb/testsuite/Makefile.in | 1 + gdbserver/Makefile.in | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 40732cb2227..d001359539a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2035,7 +2035,7 @@ check-headers: done .PHONY: check-headers -info install-info clean-info dvi pdf install-pdf html install-html: force +info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do # Traditionally "install" depends on "all". But it may be useful diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in index 2a40be4ade0..2db8706eba6 100644 --- a/gdb/data-directory/Makefile.in +++ b/gdb/data-directory/Makefile.in @@ -422,7 +422,7 @@ maintainer-clean realclean distclean: clean .PHONY: install-info install-pdf install-html clean-info check installcheck: info dvi pdf html: -install-info install-pdf install-html: +install-info install-dvi install-pdf install-html: clean-info: # GNU Make has an annoying habit of putting *all* the Makefile variables diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 04f9dbd27f0..8007f6373d4 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -24,6 +24,7 @@ prefix = @prefix@ infodir = @infodir@ datarootdir = @datarootdir@ docdir = @docdir@ +dvidir = @dvidir@ pdfdir = @pdfdir@ htmldir = @htmldir@ mandir = @mandir@ @@ -87,6 +88,8 @@ SET_TEXINPUTS = \ # Files which should be generated via 'info' and installed by 'install-info' INFO_DEPS = gdb.info stabs.info annotate.info +# Files which should be generated via 'dvi' and installed by 'install-dvi' +DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi # Files which should be generated via 'pdf' and installed by 'install-pdf' PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf # Files which should be generated via 'html' and installed by 'install-html' @@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@ all: info info: $(INFO_DEPS) -dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi +dvi: $(DVIFILES) ps: gdb.ps stabs.ps refcard.ps annotate.ps html: $(HTMLFILES) pdf: $(PDFFILES) @@ -233,7 +236,7 @@ Doxyfile-gdb-xref: $(srcdir)/Doxyfile-gdb-xref.in Doxyfile-gdbserver: $(srcdir)/Doxyfile-gdbserver.in $(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver -all-doc: info dvi ps # pdf +all-doc: info dvi ps pdf diststuff: info man rm -f gdb-cfg.texi @@ -293,6 +296,18 @@ install-html: $(HTMLFILES) fi; \ done +dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + +install-dvi: $(DVIFILES) + @$(NORMAL_INSTALL) + test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)" + @list='$(DVIFILES)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(dvi__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \ + done + pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; install-pdf: $(PDFFILES) diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index f6603daf7fd..f799f16c2bb 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -105,6 +105,7 @@ INFODIRS=doc info: install-info: dvi: +install-dvi: pdf: install-pdf: html: diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index d12f8746611..4eed8926f48 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -342,6 +342,7 @@ installcheck: check: info dvi pdf: install-info: +install-dvi: install-pdf: html: install-html: