diff options
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/libc/Makefile.am | 6 | ||||
| -rw-r--r-- | newlib/libc/Makefile.in | 14 | ||||
| -rw-r--r-- | newlib/libc/stdio/fwrite.c | 2 | ||||
| -rw-r--r-- | newlib/libm/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libm/Makefile.in | 12 |
6 files changed, 30 insertions, 15 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 859497893..31df6adc8 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2006-08-01 Jeff Johnston <jjohnstn@redhat.com> + + * libc/Makefile.am: Add libc_TEXINFOS dependency on + generated .texi files. + * libm/Makefile.am: Add libm_TEXINFOS dependency on + generated .texi files. + * libc/Makefile.in: Regenerated. + * libm/Makefile.in: Ditto. + 2006-08-01 Thiemo Seufer <ths@mips.com> Nigel Stephens <nigel@mips.com> diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index feba1b101..69d2bce36 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -112,8 +112,6 @@ crt0.o: sys/crt0.o sys/crt0.o: ; @true -info_TEXINFOS = libc.texinfo - # This is a list of the stmp-def files in each subdirectory which # builds .def files. We don't list subdirectories which don't build # .def files; if the list of subdirectories changes, we must change @@ -197,6 +195,10 @@ targetdep.tex: stmp-targetdep ; @true $(SUBDEFS): stmp-targetdep ; @true +info_TEXINFOS = libc.texinfo +libc_TEXINFOS = sigset.texi extra.texi stdio64.texi iconvset.texi \ + targetdep.tex $(SUBDEFS) + .PHONY: force force: diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index 06b1f5aed..da3b48e68 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -44,7 +44,8 @@ DIST_COMMON = $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/../../mkinstalldirs $(srcdir)/../../ltmain.sh \ - $(srcdir)/../../config.guess $(srcdir)/../../config.sub + $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ + $(libc_TEXINFOS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ @@ -340,7 +341,6 @@ libc_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libc_la_SOURCES = @USE_LIBTOOL_TRUE@libc_la_LIBADD = $(SUBLIBS) @USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = $(SUBLIBS) -info_TEXINFOS = libc.texinfo # This is a list of the stmp-def files in each subdirectory which # builds .def files. We don't list subdirectories which don't build @@ -359,6 +359,10 @@ SUBDEFS = \ $(LIBC_EXTRA_DEF) \ misc/stmp-def +info_TEXINFOS = libc.texinfo +libc_TEXINFOS = sigset.texi extra.texi stdio64.texi iconvset.texi \ + targetdep.tex $(SUBDEFS) + CLEANFILES = $(CRT0) \ sigset.texi stmp-sigset extra.texi stmp-extra \ stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep @@ -488,9 +492,9 @@ distclean-libtool: rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/libc.info: libc.texinfo -libc.pdf: libc.texinfo -libc.html: libc.texinfo +$(srcdir)/libc.info: libc.texinfo $(libc_TEXINFOS) +libc.pdf: libc.texinfo $(libc_TEXINFOS) +libc.html: libc.texinfo $(libc_TEXINFOS) .dvi.ps: $(DVIPS) -o $@ $< diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c index 8a2159c4a..dd739d6b7 100644 --- a/newlib/libc/stdio/fwrite.c +++ b/newlib/libc/stdio/fwrite.c @@ -30,7 +30,7 @@ ANSI_SYNOPSIS size_t <[count]>, FILE *<[fp]>); #include <stdio.h> - size_t _fwrite_r(struct _reent *<[ptr[>, const void *<[buf]>, size_t <[size]>, + size_t _fwrite_r(struct _reent *<[ptr]>, const void *<[buf]>, size_t <[size]>, size_t <[count]>, FILE *<[fp]>); TRAD_SYNOPSIS diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am index ff2a742a7..389e0767b 100644 --- a/newlib/libm/Makefile.am +++ b/newlib/libm/Makefile.am @@ -41,7 +41,7 @@ $(SUBLIBS): info_TEXINFOS = libm.texinfo -libm.info: targetdep.tex math/stmp-def +libm_TEXINFOS = targetdep.tex libm.dvi: targetdep.tex math/stmp-def diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index d7570b320..24ac14fd3 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/../../mkinstalldirs $(srcdir)/../../ltmain.sh \ - $(srcdir)/../../config.guess $(srcdir)/../../config.sub + $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ + $(libm_TEXINFOS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../acinclude.m4 \ @@ -243,6 +244,7 @@ libm_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libm_la_LIBADD = $(SUBLIBS) @USE_LIBTOOL_FALSE@noinst_LIBRARIES = libm.a info_TEXINFOS = libm.texinfo +libm_TEXINFOS = targetdep.tex CLEANFILES = tmp.texi targetdep.tex stmp-targetdep ACLOCAL_AMFLAGS = -I .. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host @@ -369,9 +371,9 @@ distclean-libtool: rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/libm.info: libm.texinfo -libm.pdf: libm.texinfo -libm.html: libm.texinfo +$(srcdir)/libm.info: libm.texinfo $(libm_TEXINFOS) +libm.pdf: libm.texinfo $(libm_TEXINFOS) +libm.html: libm.texinfo $(libm_TEXINFOS) .dvi.ps: $(DVIPS) -o $@ $< @@ -704,8 +706,6 @@ uninstall-info: uninstall-info-recursive $(SUBLIBS): -libm.info: targetdep.tex math/stmp-def - libm.dvi: targetdep.tex math/stmp-def stmp-targetdep: force |