2005-10-14 Bob Wilson <bob.wilson@acm.org>

        * libm/common/Makefile.am (doc): Do not append to $(TARGETDOC).
        * libm/common/Makefile.in: Regenerate.
        * libm/common/common.tex: Delete file.
        * libm/math/math.tex: Include .def files from common/.
        * libm/mathfp/mathfp.tex: Likewise.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 5abfc5c285f934ee3393fa590ac2838120c35362..0a21619031f20d0fdccd60f11a312e782eadde64 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-14  Bob Wilson  <bob.wilson@acm.org>
+
+        * libm/common/Makefile.am (doc): Do not append to $(TARGETDOC).
+        * libm/common/Makefile.in: Regenerate.
+        * libm/common/common.tex: Delete file.
+        * libm/math/math.tex: Include .def files from common/.
+        * libm/mathfp/mathfp.tex: Likewise.
+
 2005-10-14  Bob Wilson  <bob.wilson@acm.org>
 
        * libc/libc.texinfo (Top): Surround this node with @ifnottex

diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index 685219dd05a1a8c12a4f98bcc430d9198db7a19b..e9cca381ea3643298b8be2a1276cabf69e491a38 100644 (file)
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -49,7 +49,6 @@ CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
 TARGETDOC = ../tmp.texi
 
 doc: $(chobj)
-       cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 CLEANFILES = $(chobj) *.ref
 

diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in
index 81c78f50a6703b7766aea057b8a0ac54aa138311..898b6797011d4a8a84c954049da7ad1c45c6df7c 100644 (file)
--- a/newlib/libm/common/Makefile.in
+++ b/newlib/libm/common/Makefile.in
@@ -410,7 +410,6 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
        touch stmp-def
 
 doc: $(chobj)
-       cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 # Texinfo does not appear to support underscores in file names, so we
 # name the .def files without underscores.

diff --git a/newlib/libm/common/common.tex b/newlib/libm/common/common.tex
deleted file mode 100644 (file)
index 0e8a986..0000000
--- a/newlib/libm/common/common.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-@page
-@include common/scbrt.def
-@include common/scopysign.def
-@include common/sexpm1.def
-@include common/silogb.def
-@include common/sinfinity.def
-@include common/slog1p.def
-@include common/smatherr.def
-@include common/smodf.def
-@include common/snan.def
-@include common/snextafter.def
-@include common/sscalbn.def

diff --git a/newlib/libm/math/math.tex b/newlib/libm/math/math.tex
index abe8bce5c7cfc709bfb0c2abfe174a74f34f530e..0c84e618af1a20dad713b6292b65d987866c6131 100644 (file)
--- a/newlib/libm/math/math.tex
+++ b/newlib/libm/math/math.tex
@@ -138,6 +138,12 @@ The library is set to X/Open mode by default.
 @page
 @include math/wj0.def
 
+@page
+@include common/scbrt.def
+
+@page
+@include common/scopysign.def
+
 @page
 @include math/wcosh.def
 
@@ -147,6 +153,9 @@ The library is set to X/Open mode by default.
 @page
 @include math/wexp.def
 
+@page
+@include common/sexpm1.def
+
 @page
 @include math/sfabs.def
 
@@ -165,6 +174,12 @@ The library is set to X/Open mode by default.
 @page
 @include math/whypot.def
 
+@page
+@include common/silogb.def
+
+@page
+@include common/sinfinity.def
+
 @page
 @include math/sisnan.def
 
@@ -177,12 +192,30 @@ The library is set to X/Open mode by default.
 @page
 @include math/wlog10.def
 
+@page
+@include common/slog1p.def
+
+@page
+@include common/smatherr.def
+
+@page
+@include common/smodf.def
+
+@page
+@include common/snan.def
+
+@page
+@include common/snextafter.def
+
 @page
 @include math/wpow.def
 
 @page
 @include math/wremainder.def
 
+@page
+@include common/sscalbn.def
+
 @page
 @include math/wsqrt.def
 

diff --git a/newlib/libm/mathfp/mathfp.tex b/newlib/libm/mathfp/mathfp.tex
index 0d496a24135f03100a6ede5af432296391efea85..87905dcb168c740bbcdea52d1179837115555e53 100644 (file)
--- a/newlib/libm/mathfp/mathfp.tex
+++ b/newlib/libm/mathfp/mathfp.tex
@@ -138,6 +138,12 @@ The library is set to X/Open mode by default.
 @page
 @include mathfp/wjn.def
 
+@page
+@include common/scbrt.def
+
+@page
+@include common/scopysign.def
+
 @page
 @include mathfp/scosh.def
 
@@ -147,6 +153,9 @@ The library is set to X/Open mode by default.
 @page
 @include mathfp/sexp.def
 
+@page
+@include common/sexpm1.def
+
 @page
 @include mathfp/sfabs.def
 
@@ -165,6 +174,12 @@ The library is set to X/Open mode by default.
 @page
 @include mathfp/ehypot.def
 
+@page
+@include common/silogb.def
+
+@page
+@include common/sinfinity.def
+
 @page
 @include mathfp/sisnan.def
 
@@ -177,12 +192,30 @@ The library is set to X/Open mode by default.
 @page
 @include mathfp/slog10.def
 
+@page
+@include common/slog1p.def
+
+@page
+@include common/smatherr.def
+
+@page
+@include common/smodf.def
+
+@page
+@include common/snan.def
+
+@page
+@include common/snextafter.def
+
 @page
 @include mathfp/spow.def
 
 @page
 @include mathfp/eremainder.def
 
+@page
+@include common/sscalbn.def
+
 @page
 @include mathfp/ssqrt.def