From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id D87F03858D1E for ; Thu, 10 Feb 2022 04:27:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D87F03858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 70AF9342FF2; Thu, 10 Feb 2022 04:27:38 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Cc: Jon Turney Subject: [PATCH/committed] newlib: fix mkdoc dependencies Date: Wed, 9 Feb 2022 23:27:39 -0500 Message-Id: <20220210042739.12579-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <48be44ec-5051-3f60-279b-ae53500559e5@dronecode.org.uk> References: <48be44ec-5051-3f60-279b-ae53500559e5@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2022 04:27:40 -0000 Make sure we depend on the right name of mkdoc all the time, and that the rules that need it (e.g. .def files) depend on it. Reported-by: Jon Turney --- newlib/Makefile.in | 4 +++- newlib/doc/local.mk | 6 +++--- newlib/libc/Makefile.inc | 1 + newlib/libm/Makefile.inc | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/newlib/doc/local.mk b/newlib/doc/local.mk index 15c43f225e66..de1dd1f2bb09 100644 --- a/newlib/doc/local.mk +++ b/newlib/doc/local.mk @@ -1,8 +1,8 @@ -# We can't use noinst_PROGRAMS, because automake will add $(EXEEXT). -noinst_DATA += doc/makedoc - MKDOC = doc/makedoc$(EXEEXT_FOR_BUILD) +# We can't use noinst_PROGRAMS, because automake will add $(EXEEXT). +noinst_DATA += $(MKDOC) + # We don't use CFLAGS with CC_FOR_BUILD because here CFLAGS will # actually be CFLAGS_FOR_TARGET, and in some cases that will include # -Os, which CC_FOR_BUILD may not recognize. diff --git a/newlib/libc/Makefile.inc b/newlib/libc/Makefile.inc index fff9e880506f..f30ced867eec 100644 --- a/newlib/libc/Makefile.inc +++ b/newlib/libc/Makefile.inc @@ -5,6 +5,7 @@ LIBC_CHEWOUT_FILES = LIBC_CHAPTERS = %D%/sys.tex LIBC_DOCBOOK_OUT_FILES = $(LIBC_CHEWOUT_FILES:.def=.xml) +$(LIBC_CHEWOUT_FILES): $(MKDOC) %D%/libc.dvi: %D%/targetdep.tex $(LIBC_CHEWOUT_FILES) diff --git a/newlib/libm/Makefile.inc b/newlib/libm/Makefile.inc index f2f192ea81fe..7fdea0ca518e 100644 --- a/newlib/libm/Makefile.inc +++ b/newlib/libm/Makefile.inc @@ -5,6 +5,7 @@ LIBM_CHEWOUT_FILES = LIBM_CHAPTERS = LIBM_DOCBOOK_OUT_FILES = $(LIBM_CHEWOUT_FILES:.def=.xml) +$(LIBM_CHEWOUT_FILES): $(MKDOC) %D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES) -- 2.34.1