From 06312793945e184036b9491767b9eacac9be3890 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 2 Nov 2015 18:00:28 -0500 Subject: Move duplicated documentation rules to Makefile.shared - Also, harmonize libm to use CHEWOUT_FILES like libc, rather than chobj. Update documentation appropriately. * HOWTO: Update. * Makefile.shared: Move documentation rules to here... * libc/argz/Makefile.am: ... from here ... * libc/ctype/Makefile.am: ... and here. * libc/errno/Makefile.am: Ditto. * libc/iconv/Makefile.am: Ditto. * libc/iconv/ccs/Makefile.am : Ditto. * libc/iconv/ces/Makefile.am: Ditto. * libc/iconv/lib/Makefile.am: Ditto. * libc/locale/Makefile.am: Ditto. * libc/misc/Makefile.am: Ditto. * libc/posix/Makefile.am: Ditto. * libc/reent/Makefile.am: Ditto. * libc/search/Makefile.am: Ditto. * libc/stdio/Makefile.am: Ditto. * libc/stdio64/Makefile.am: Ditto. * libc/stdlib/Makefile.am : Ditto. * libc/string/Makefile.am: Ditto. * libc/syscalls/Makefile.am: Ditto. * libc/time/Makefile.am : Ditto. * libc/unix/Makefile.am: Ditto. * libc/xdr/Makefile.am: Ditto. * libm/common/Makefile.am: Ditto. * libm/complex/Makefile.am: Ditto. * libm/math/Makefile.am: Ditto. * libm/mathfp/Makefile.am: Ditto. --- newlib/libm/common/Makefile.am | 16 +--- newlib/libm/common/Makefile.in | 22 +++-- newlib/libm/complex/Makefile.am | 18 +--- newlib/libm/machine/aarch64/Makefile.in | 22 ++++- newlib/libm/machine/arm/Makefile.in | 22 ++++- newlib/libm/machine/i386/Makefile.in | 22 ++++- newlib/libm/machine/nds32/Makefile.in | 22 ++++- newlib/libm/machine/spu/Makefile.in | 22 ++++- newlib/libm/math/Makefile.am | 17 +--- newlib/libm/math/Makefile.in | 40 ++++---- newlib/libm/mathfp/Makefile.am | 17 +--- newlib/libm/mathfp/Makefile.in | 161 ++++++++------------------------ 12 files changed, 193 insertions(+), 208 deletions(-) (limited to 'newlib/libm') diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am index d5e0ef959..2a2794869 100644 --- a/newlib/libm/common/Makefile.am +++ b/newlib/libm/common/Makefile.am @@ -55,7 +55,7 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -chobj = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ +CHEWOUT_FILES = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ s_infinity.def s_isnan.def s_log1p.def s_matherr.def s_modf.def \ s_nan.def s_nextafter.def s_pow10.def s_scalbn.def \ s_fdim.def s_fma.def s_fmax.def s_fmin.def \ @@ -63,19 +63,7 @@ chobj = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ s_remquo.def s_rint.def s_round.def s_signbit.def s_trunc.def \ isgreater.def -SUFFIXES = .def - -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str - -.c.def: - $(CHEW) < $< > $*.def 2> $*.ref - touch stmp-def - -TARGETDOC = ../tmp.texi - -doc: $(chobj) - -CLEANFILES = $(chobj) *.ref +CHAPTERS = # A partial dependency list. diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index ae5949a48..a1b27870f 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -372,7 +372,14 @@ libcommon_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) $(am__append_2) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -chobj = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref +CHEWOUT_FILES = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ s_infinity.def s_isnan.def s_log1p.def s_matherr.def s_modf.def \ s_nan.def s_nextafter.def s_pow10.def s_scalbn.def \ s_fdim.def s_fma.def s_fmax.def s_fmin.def \ @@ -380,10 +387,7 @@ chobj = s_cbrt.def s_copysign.def s_exp10.def s_expm1.def s_ilogb.def \ s_remquo.def s_rint.def s_round.def s_signbit.def s_trunc.def \ isgreater.def -SUFFIXES = .def -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str -TARGETDOC = ../tmp.texi -CLEANFILES = $(chobj) *.ref +CHAPTERS = all: all-am .SUFFIXES: @@ -1433,7 +1437,13 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) $(CHEW) < $< > $*.def 2> $*.ref touch stmp-def -doc: $(chobj) +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done # A partial dependency list. diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am index 1c4a50255..d3db95974 100644 --- a/newlib/libm/complex/Makefile.am +++ b/newlib/libm/complex/Makefile.am @@ -33,27 +33,13 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -chobj = cabs.def cacos.def cacosh.def carg.def \ +CHEWOUT_FILES = cabs.def cacos.def cacosh.def carg.def \ casin.def casinh.def catan.def catanh.def \ ccos.def ccosh.def cexp.def cimag.def clog.def \ conj.def cpow.def cproj.def creal.def \ csin.def csinh.def csqrt.def ctan.def ctanh.def - -SUFFIXES = .def - -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str - -.c.def: - $(CHEW) < $< > $*.def 2> $*.ref - touch stmp-def - -TARGETDOC = ../tmp.texi - -doc: $(chobj) - cat $(srcdir)/complex.tex >> $(TARGETDOC) - -CLEANFILES = $(chobj) *.ref +CHAPTERS = complex.tex # A partial dependency list. diff --git a/newlib/libm/machine/aarch64/Makefile.in b/newlib/libm/machine/aarch64/Makefile.in index 6b5c36038..883e2e5a0 100644 --- a/newlib/libm/machine/aarch64/Makefile.in +++ b/newlib/libm/machine/aarch64/Makefile.in @@ -247,12 +247,19 @@ lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .def .c .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../Makefile.shared $(am__configure_deps) @@ -565,6 +572,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -665,6 +673,18 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) echo $$i `pwd`/$$i >> objectlist.awk.in ; \ done +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/machine/arm/Makefile.in b/newlib/libm/machine/arm/Makefile.in index 7bd6b8d97..25fcbdb0f 100644 --- a/newlib/libm/machine/arm/Makefile.in +++ b/newlib/libm/machine/arm/Makefile.in @@ -220,12 +220,19 @@ lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .def .c .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../Makefile.shared $(am__configure_deps) @@ -430,6 +437,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -530,6 +538,18 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) echo $$i `pwd`/$$i >> objectlist.awk.in ; \ done +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/machine/i386/Makefile.in b/newlib/libm/machine/i386/Makefile.in index dba2ba353..e599d5c42 100644 --- a/newlib/libm/machine/i386/Makefile.in +++ b/newlib/libm/machine/i386/Makefile.in @@ -275,12 +275,19 @@ libi386_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) @USE_LIBTOOL_FALSE@lib_a_CCASFLAGS = $(AM_CCASFLAGS) + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj +.SUFFIXES: .def .S .c .lo .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../Makefile.shared $(am__configure_deps) @@ -595,6 +602,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -698,6 +706,18 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) echo $$i `pwd`/$$i >> objectlist.awk.in ; \ done +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/machine/nds32/Makefile.in b/newlib/libm/machine/nds32/Makefile.in index 3ce60b940..2609551c2 100644 --- a/newlib/libm/machine/nds32/Makefile.in +++ b/newlib/libm/machine/nds32/Makefile.in @@ -214,12 +214,19 @@ lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .S .o .obj +.SUFFIXES: .def .S .c .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../Makefile.shared $(am__configure_deps) @@ -364,6 +371,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -464,6 +472,18 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) echo $$i `pwd`/$$i >> objectlist.awk.in ; \ done +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/machine/spu/Makefile.in b/newlib/libm/machine/spu/Makefile.in index 3ac4e36ea..b5fcc8d02 100644 --- a/newlib/libm/machine/spu/Makefile.in +++ b/newlib/libm/machine/spu/Makefile.in @@ -287,12 +287,19 @@ lib_a_SOURCES = $(LIB_SOURCES) lib_a_CFLAGS = $(AM_CFLAGS) lib_a_CCASFLAGS = $(AM_CCASFLAGS) noinst_DATA = + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .def .c .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../Makefile.shared $(am__configure_deps) @@ -1175,6 +1182,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1275,6 +1283,18 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) echo $$i `pwd`/$$i >> objectlist.awk.in ; \ done +.c.def: + $(CHEW) < $< > $*.def 2> $*.ref + touch stmp-def + +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am index 2616ada1f..9e8e92840 100644 --- a/newlib/libm/math/Makefile.am +++ b/newlib/libm/math/Makefile.am @@ -67,7 +67,7 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -chobj = w_acos.def w_acosh.def w_asin.def s_asinh.def \ +CHEWOUT_FILES = w_acos.def w_acosh.def w_asin.def s_asinh.def \ s_atan.def w_atan2.def w_atanh.def w_j0.def \ w_cosh.def s_erf.def w_exp.def w_exp2.def \ s_fabs.def s_floor.def w_fmod.def s_frexp.def \ @@ -76,20 +76,7 @@ chobj = w_acos.def w_acosh.def w_asin.def s_asinh.def \ w_pow.def w_remainder.def s_sin.def w_sinh.def \ w_sqrt.def s_tan.def s_tanh.def -SUFFIXES = .def - -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str - -.c.def: - $(CHEW) < $< > $*.def 2> $*.ref - touch stmp-def - -TARGETDOC = ../tmp.texi - -doc: $(chobj) - cat $(srcdir)/math.tex >> $(TARGETDOC) - -CLEANFILES = $(chobj) *.ref +CHAPTERS = math.tex # A partial dependency list. diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index 233c7c257..0f2aa010e 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -138,14 +138,13 @@ am__objects_2 = lib_a-kf_rem_pio2.$(OBJEXT) lib_a-kf_cos.$(OBJEXT) \ lib_a-sf_signif.$(OBJEXT) lib_a-sf_sin.$(OBJEXT) \ lib_a-sf_tan.$(OBJEXT) lib_a-sf_tanh.$(OBJEXT) \ lib_a-wf_exp2.$(OBJEXT) lib_a-wf_tgamma.$(OBJEXT) -am__objects_5 = lib_a-el_hypot.$(OBJEXT) +am__objects_3 = lib_a-el_hypot.$(OBJEXT) @USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \ -@USE_LIBTOOL_FALSE@ $(am__objects_2) \ -@USE_LIBTOOL_FALSE@ $(am__objects_5) +@USE_LIBTOOL_FALSE@ $(am__objects_2) $(am__objects_3) lib_a_OBJECTS = $(am_lib_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) libmath_la_LIBADD = -am__objects_3 = k_standard.lo k_rem_pio2.lo k_cos.lo k_sin.lo k_tan.lo \ +am__objects_4 = k_standard.lo k_rem_pio2.lo k_cos.lo k_sin.lo k_tan.lo \ e_acos.lo e_acosh.lo e_asin.lo e_atan2.lo e_atanh.lo e_cosh.lo \ e_exp.lo e_fmod.lo er_gamma.lo e_hypot.lo e_j0.lo e_j1.lo \ e_jn.lo er_lgamma.lo e_log.lo e_log10.lo e_pow.lo \ @@ -157,7 +156,7 @@ am__objects_3 = k_standard.lo k_rem_pio2.lo k_cos.lo k_sin.lo k_tan.lo \ w_sincos.lo w_drem.lo s_asinh.lo s_atan.lo s_ceil.lo s_cos.lo \ s_erf.lo s_fabs.lo s_floor.lo s_frexp.lo s_ldexp.lo \ s_signif.lo s_sin.lo s_tan.lo s_tanh.lo w_exp2.lo w_tgamma.lo -am__objects_4 = kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.lo \ +am__objects_5 = kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.lo \ ef_acos.lo ef_acosh.lo ef_asin.lo ef_atan2.lo ef_atanh.lo \ ef_cosh.lo ef_exp.lo ef_fmod.lo erf_gamma.lo ef_hypot.lo \ ef_j0.lo ef_j1.lo ef_jn.lo erf_lgamma.lo ef_log.lo ef_log10.lo \ @@ -171,10 +170,9 @@ am__objects_4 = kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.lo \ sf_cos.lo sf_erf.lo sf_fabs.lo sf_floor.lo sf_frexp.lo \ sf_ldexp.lo sf_signif.lo sf_sin.lo sf_tan.lo sf_tanh.lo \ wf_exp2.lo wf_tgamma.lo -am__objects_6 = el_hypot.lo -@USE_LIBTOOL_TRUE@am_libmath_la_OBJECTS = $(am__objects_3) \ -@USE_LIBTOOL_TRUE@ $(am__objects_4) \ -@USE_LIBTOOL_TRUE@ $(am__objects_6) +am__objects_6 = el_hypot.lo +@USE_LIBTOOL_TRUE@am_libmath_la_OBJECTS = $(am__objects_4) \ +@USE_LIBTOOL_TRUE@ $(am__objects_5) $(am__objects_6) libmath_la_OBJECTS = $(am_libmath_la_OBJECTS) libmath_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -377,7 +375,6 @@ fsrc = kf_rem_pio2.c \ wf_exp2.c wf_tgamma.c lsrc = el_hypot.c - libmath_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmath.la @USE_LIBTOOL_TRUE@libmath_la_SOURCES = $(src) $(fsrc) $(lsrc) @@ -386,7 +383,14 @@ libmath_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) $(lsrc) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -chobj = w_acos.def w_acosh.def w_asin.def s_asinh.def \ + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref +CHEWOUT_FILES = w_acos.def w_acosh.def w_asin.def s_asinh.def \ s_atan.def w_atan2.def w_atanh.def w_j0.def \ w_cosh.def s_erf.def w_exp.def w_exp2.def \ s_fabs.def s_floor.def w_fmod.def s_frexp.def \ @@ -395,10 +399,7 @@ chobj = w_acos.def w_acosh.def w_asin.def s_asinh.def \ w_pow.def w_remainder.def s_sin.def w_sinh.def \ w_sqrt.def s_tan.def s_tanh.def -SUFFIXES = .def -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str -TARGETDOC = ../tmp.texi -CLEANFILES = $(chobj) *.ref +CHAPTERS = math.tex all: all-am .SUFFIXES: @@ -1460,8 +1461,13 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) $(CHEW) < $< > $*.def 2> $*.ref touch stmp-def -doc: $(chobj) - cat $(srcdir)/math.tex >> $(TARGETDOC) +TARGETDOC ?= ../tmp.texi + +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done # A partial dependency list. diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am index 0caab07a4..db83ea082 100644 --- a/newlib/libm/mathfp/Makefile.am +++ b/newlib/libm/mathfp/Makefile.am @@ -58,7 +58,7 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared -chobj = e_acosh.def \ +CHEWOUT_FILES = e_acosh.def \ e_atanh.def \ e_hypot.def \ e_remainder.def \ @@ -87,20 +87,7 @@ chobj = e_acosh.def \ s_tanh.def \ w_jn.def -SUFFIXES = .def - -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str - -.c.def: - $(CHEW) < $< > $*.def 2> $*.ref - touch stmp-def - -TARGETDOC = ../tmp.texi - -doc: $(chobj) - cat $(srcdir)/mathfp.tex >> $(TARGETDOC) - -CLEANFILES = $(chobj) *.ref +CHAPTERS = mathfp.tex # A partial dependency list. diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index 57a24fa1a..a39bec5e9 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -348,39 +348,43 @@ libmathfp_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -chobj = eacosh.def \ - eatanh.def \ - ehypot.def \ - eremainder.def \ - erlgamma.def \ - sacos.def \ - sasine.def \ - sasinh.def \ - satan.def \ - satan2.def \ - satangent.def \ - scosh.def \ - serf.def \ - sexp.def \ - sfabs.def \ - sfloor.def \ - sfmod.def \ - sfrexp.def \ - sldexp.def \ - slog10.def \ - slogarithm.def \ - spow.def \ - ssine.def \ - ssineh.def \ - ssqrt.def \ - stan.def \ - stanh.def \ - wjn.def +# +# documentation rules +# SUFFIXES = .def -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str -TARGETDOC = ../tmp.texi -CLEANFILES = $(chobj) *.ref +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str +CLEANFILES = $(CHEWOUT_FILES) *.ref +CHEWOUT_FILES = e_acosh.def \ + e_atanh.def \ + e_hypot.def \ + e_remainder.def \ + er_lgamma.def \ + s_acos.def \ + s_asine.def \ + s_asinh.def \ + s_atan.def \ + s_atan2.def \ + s_atangent.def \ + s_cosh.def \ + s_erf.def \ + s_exp.def \ + s_fabs.def \ + s_floor.def \ + s_fmod.def \ + s_frexp.def \ + s_ldexp.def \ + s_log10.def \ + s_logarithm.def \ + s_pow.def \ + s_sine.def \ + s_sineh.def \ + s_sqrt.def \ + s_tan.def \ + s_tanh.def \ + w_jn.def + +CHAPTERS = mathfp.tex all: all-am .SUFFIXES: @@ -1196,96 +1200,13 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) $(CHEW) < $< > $*.def 2> $*.ref touch stmp-def -doc: $(chobj) - cat $(srcdir)/mathfp.tex >> $(TARGETDOC) +TARGETDOC ?= ../tmp.texi -# Texinfo does not appear to support underscores in file names, so we -# name the .def files without underscores. - -eacosh.def: e_acosh.c - $(CHEW) < $(srcdir)/e_acosh.c >$@ 2>/dev/null - touch stmp-def -eatanh.def: e_atanh.c - $(CHEW) < $(srcdir)/e_atanh.c >$@ 2>/dev/null - touch stmp-def -ehypot.def: e_hypot.c - $(CHEW) < $(srcdir)/e_hypot.c >$@ 2>/dev/null - touch stmp-def -eremainder.def: e_remainder.c - $(CHEW) < $(srcdir)/e_remainder.c >$@ 2>/dev/null - touch stmp-def -erlgamma.def: er_lgamma.c - $(CHEW) < $(srcdir)/er_lgamma.c >$@ 2>/dev/null - touch stmp-def -sacos.def: s_acos.c - $(CHEW) < $(srcdir)/s_acos.c >$@ 2>/dev/null - touch stmp-def -sasine.def: s_asine.c - $(CHEW) < $(srcdir)/s_asine.c >$@ 2>/dev/null - touch stmp-def -sasinh.def: s_asinh.c - $(CHEW) < $(srcdir)/s_asinh.c >$@ 2>/dev/null - touch stmp-def -satan.def: s_atan.c - $(CHEW) < $(srcdir)/s_atan.c >$@ 2>/dev/null - touch stmp-def -satan2.def: s_atan2.c - $(CHEW) < $(srcdir)/s_atan2.c >$@ 2>/dev/null - touch stmp-def -satangent.def: s_atangent.c - $(CHEW) < $(srcdir)/s_atangent.c >$@ 2>/dev/null - touch stmp-def -scosh.def: s_cosh.c - $(CHEW) < $(srcdir)/s_cosh.c >$@ 2>/dev/null - touch stmp-def -serf.def: s_erf.c - $(CHEW) < $(srcdir)/s_erf.c >$@ 2>/dev/null - touch stmp-def -sexp.def: s_exp.c - $(CHEW) < $(srcdir)/s_exp.c >$@ 2>/dev/null - touch stmp-def -sfabs.def: s_fabs.c - $(CHEW) < $(srcdir)/s_fabs.c >$@ 2>/dev/null - touch stmp-def -sfloor.def: s_floor.c - $(CHEW) < $(srcdir)/s_floor.c >$@ 2>/dev/null - touch stmp-def -sfmod.def: s_fmod.c - $(CHEW) < $(srcdir)/s_fmod.c >$@ 2>/dev/null - touch stmp-def -sfrexp.def: s_frexp.c - $(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null - touch stmp-def -sldexp.def: s_ldexp.c - $(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null - touch stmp-def -slog10.def: s_log10.c - $(CHEW) < $(srcdir)/s_log10.c >$@ 2>/dev/null - touch stmp-def -slogarithm.def: s_logarithm.c - $(CHEW) < $(srcdir)/s_logarithm.c >$@ 2>/dev/null - touch stmp-def -spow.def: s_pow.c - $(CHEW) < $(srcdir)/s_pow.c >$@ 2>/dev/null - touch stmp-def -ssine.def: s_sine.c - $(CHEW) < $(srcdir)/s_sine.c >$@ 2>/dev/null - touch stmp-def -ssineh.def: s_sineh.c - $(CHEW) < $(srcdir)/s_sineh.c >$@ 2>/dev/null - touch stmp-def -ssqrt.def: s_sqrt.c - $(CHEW) < $(srcdir)/s_sqrt.c >$@ 2>/dev/null - touch stmp-def -stan.def: s_tan.c - $(CHEW) < $(srcdir)/s_tan.c >$@ 2>/dev/null - touch stmp-def -stanh.def: s_tanh.c - $(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null - touch stmp-def -wjn.def: w_jn.c - $(CHEW) < $(srcdir)/w_jn.c >$@ 2>/dev/null - touch stmp-def +doc: $(CHEWOUT_FILES) + for chapter in $(CHAPTERS) ; \ + do \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ + done # A partial dependency list. -- cgit v1.2.3