From 1a8696985f9850ebbeccde41d5afb2e17bc6d1bc Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Fri, 14 Oct 2005 18:55:57 +0000
Subject: [PATCH] 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.
---
newlib/ChangeLog | 8 ++++++++
newlib/libm/common/Makefile.am | 1 -
newlib/libm/common/Makefile.in | 1 -
newlib/libm/common/common.tex | 12 ------------
newlib/libm/math/math.tex | 33 +++++++++++++++++++++++++++++++++
newlib/libm/mathfp/mathfp.tex | 33 +++++++++++++++++++++++++++++++++
6 files changed, 74 insertions(+), 14 deletions(-)
delete mode 100644 newlib/libm/common/common.tex
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 5abfc5c28..0a2161903 100644
--- 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 685219dd0..e9cca381e 100644
--- 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 81c78f50a..898b67970 100644
--- 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
index 0e8a9863f..000000000
--- 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 abe8bce5c..0c84e618a 100644
--- 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 0d496a241..87905dcb1 100644
--- 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