From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 72BB73858D1E; Thu, 10 Feb 2022 04:27:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72BB73858D1E Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: fix mkdoc dependencies X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 006da84337d31354b2f8ed21039b5a8bbc579b9b X-Git-Newrev: 5c21b3721475c0d848b567837b4459cffcf0ca13 Message-Id: <20220210042721.72BB73858D1E@sourceware.org> Date: Thu, 10 Feb 2022 04:27:21 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2022 04:27:21 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D5c21b372147= 5c0d848b567837b4459cffcf0ca13 commit 5c21b3721475c0d848b567837b4459cffcf0ca13 Author: Mike Frysinger Date: Wed Feb 9 23:26:19 2022 -0500 newlib: fix mkdoc dependencies =20 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. =20 Reported-by: Jon Turney Diff: --- 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/Makefile.in b/newlib/Makefile.in index e76fa582a..fd6323260 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -93,7 +93,7 @@ host_triplet =3D @host@ @HAVE_MULTISUBDIR_TRUE@am__append_2 =3D $(BUILD_MULTISUBDIR)/libc.a $(BUIL= D_MULTISUBDIR)/libm.a =20 # We can't use noinst_PROGRAMS, because automake will add $(EXEEXT). -@HAVE_DOC_TRUE@am__append_3 =3D doc/makedoc +@HAVE_DOC_TRUE@am__append_3 =3D $(MKDOC) @HAVE_DOC_TRUE@am__append_4 =3D man-cache =20 # @@ -1759,6 +1759,7 @@ clean-local: =20 @HAVE_DOC_TRUE@.c.xml: @HAVE_DOC_TRUE@ $(AM_V_GEN)$(DOCBOOK_CHEW) < $< > $*.xml || ( rm $*.xml &&= false ) +$(LIBC_CHEWOUT_FILES): $(MKDOC) =20 libc/libc.dvi: libc/targetdep.tex $(LIBC_CHEWOUT_FILES) =20 @@ -1786,6 +1787,7 @@ libc_install-man: libc_man $(MKDIR_P) $(DESTDIR)$(mandir)/man3 $(INSTALL_DATA) libc/*.3 $(DESTDIR)$(mandir)/man3/ install-man: libc_install-man +$(LIBM_CHEWOUT_FILES): $(MKDOC) =20 libm/libm.dvi: libm/targetdep.tex $(LIBM_CHEWOUT_FILES) =20 diff --git a/newlib/doc/local.mk b/newlib/doc/local.mk index 15c43f225..de1dd1f2b 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 +=3D doc/makedoc - MKDOC =3D doc/makedoc$(EXEEXT_FOR_BUILD) =20 +# We can't use noinst_PROGRAMS, because automake will add $(EXEEXT). +noinst_DATA +=3D $(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 fff9e8805..f30ced867 100644 --- a/newlib/libc/Makefile.inc +++ b/newlib/libc/Makefile.inc @@ -5,6 +5,7 @@ LIBC_CHEWOUT_FILES =3D =20 LIBC_CHAPTERS =3D %D%/sys.tex LIBC_DOCBOOK_OUT_FILES =3D $(LIBC_CHEWOUT_FILES:.def=3D.xml) +$(LIBC_CHEWOUT_FILES): $(MKDOC) =20 %D%/libc.dvi: %D%/targetdep.tex $(LIBC_CHEWOUT_FILES) =20 diff --git a/newlib/libm/Makefile.inc b/newlib/libm/Makefile.inc index f2f192ea8..7fdea0ca5 100644 --- a/newlib/libm/Makefile.inc +++ b/newlib/libm/Makefile.inc @@ -5,6 +5,7 @@ LIBM_CHEWOUT_FILES =3D =20 LIBM_CHAPTERS =3D LIBM_DOCBOOK_OUT_FILES =3D $(LIBM_CHEWOUT_FILES:.def=3D.xml) +$(LIBM_CHEWOUT_FILES): $(MKDOC) =20 %D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES)