libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mike Frysinger 2022-02-09 23:26:19 -05:00
parent 006da84337
commit 5c21b37214
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/Makefile.in
View File

@ -93,7 +93,7 @@ host_triplet = @host@
@HAVE_MULTISUBDIR_TRUE@am__append_2 = $(BUILD_MULTISUBDIR)/libc.a $(BUILD_MULTISUBDIR)/libm.a @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). # 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 @HAVE_DOC_TRUE@am__append_4 = man-cache
# #
@ -1759,6 +1759,7 @@ clean-local:
@HAVE_DOC_TRUE@.c.xml: @HAVE_DOC_TRUE@.c.xml:
@HAVE_DOC_TRUE@ $(AM_V_GEN)$(DOCBOOK_CHEW) < $< > $*.xml || ( rm $*.xml && false ) @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) libc/libc.dvi: libc/targetdep.tex $(LIBC_CHEWOUT_FILES)
@ -1786,6 +1787,7 @@ libc_install-man: libc_man
$(MKDIR_P) $(DESTDIR)$(mandir)/man3 $(MKDIR_P) $(DESTDIR)$(mandir)/man3
$(INSTALL_DATA) libc/*.3 $(DESTDIR)$(mandir)/man3/ $(INSTALL_DATA) libc/*.3 $(DESTDIR)$(mandir)/man3/
install-man: libc_install-man install-man: libc_install-man
$(LIBM_CHEWOUT_FILES): $(MKDOC)
libm/libm.dvi: libm/targetdep.tex $(LIBM_CHEWOUT_FILES) libm/libm.dvi: libm/targetdep.tex $(LIBM_CHEWOUT_FILES)

6
newlib/doc/local.mk
View File

@ -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) 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 # 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 # actually be CFLAGS_FOR_TARGET, and in some cases that will include
# -Os, which CC_FOR_BUILD may not recognize. # -Os, which CC_FOR_BUILD may not recognize.

1
newlib/libc/Makefile.inc
View File

@ -5,6 +5,7 @@ LIBC_CHEWOUT_FILES =
LIBC_CHAPTERS = %D%/sys.tex LIBC_CHAPTERS = %D%/sys.tex
LIBC_DOCBOOK_OUT_FILES = $(LIBC_CHEWOUT_FILES:.def=.xml) LIBC_DOCBOOK_OUT_FILES = $(LIBC_CHEWOUT_FILES:.def=.xml)
$(LIBC_CHEWOUT_FILES): $(MKDOC)
%D%/libc.dvi: %D%/targetdep.tex $(LIBC_CHEWOUT_FILES) %D%/libc.dvi: %D%/targetdep.tex $(LIBC_CHEWOUT_FILES)

1
newlib/libm/Makefile.inc
View File

@ -5,6 +5,7 @@ LIBM_CHEWOUT_FILES =
LIBM_CHAPTERS = LIBM_CHAPTERS =
LIBM_DOCBOOK_OUT_FILES = $(LIBM_CHEWOUT_FILES:.def=.xml) LIBM_DOCBOOK_OUT_FILES = $(LIBM_CHEWOUT_FILES:.def=.xml)
$(LIBM_CHEWOUT_FILES): $(MKDOC)
%D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES) %D%/libm.dvi: %D%/targetdep.tex $(LIBM_CHEWOUT_FILES)