diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-02-10 07:26:19 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-10 07:26:19 +0300 |
| commit | 5c21b3721475c0d848b567837b4459cffcf0ca13 (patch) | |
| tree | 9950864eb4e588d1c11bfb0daef66298d8931e65 | |
| parent | 006da84337d31354b2f8ed21039b5a8bbc579b9b (diff) | |
newlib: fix mkdoc dependencies
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 <jon.turney@dronecode.org.uk>
| -rw-r--r-- | newlib/Makefile.in | 4 | ||||
| -rw-r--r-- | newlib/doc/local.mk | 6 | ||||
| -rw-r--r-- | newlib/libc/Makefile.inc | 1 | ||||
| -rw-r--r-- | 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 = @host@ @HAVE_MULTISUBDIR_TRUE@am__append_2 = $(BUILD_MULTISUBDIR)/libc.a $(BUILD_MULTISUBDIR)/libm.a # We can't use noinst_PROGRAMS, because automake will add $(EXEEXT). -@HAVE_DOC_TRUE@am__append_3 = doc/makedoc +@HAVE_DOC_TRUE@am__append_3 = $(MKDOC) @HAVE_DOC_TRUE@am__append_4 = man-cache # @@ -1759,6 +1759,7 @@ clean-local: @HAVE_DOC_TRUE@.c.xml: @HAVE_DOC_TRUE@ $(AM_V_GEN)$(DOCBOOK_CHEW) < $< > $*.xml || ( rm $*.xml && false ) +$(LIBC_CHEWOUT_FILES): $(MKDOC) libc/libc.dvi: libc/targetdep.tex $(LIBC_CHEWOUT_FILES) @@ -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) libm/libm.dvi: libm/targetdep.tex $(LIBM_CHEWOUT_FILES) 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 += 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 fff9e8805..f30ced867 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 f2f192ea8..7fdea0ca5 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) |