diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2015-11-02 18:00:28 -0500 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2015-11-02 18:02:39 -0500 |
commit | 06312793945e184036b9491767b9eacac9be3890 (patch) | |
tree | b8e4fbafe646bf9b186d1b93ff56d0f7c7794658 /newlib/libc/search | |
parent | 53617ce4e634bd6f67e6e08939518dba77dee3f1 (diff) | |
download | newlib-06312793945e184036b9491767b9eacac9be3890.zip newlib-06312793945e184036b9491767b9eacac9be3890.tar.gz newlib-06312793945e184036b9491767b9eacac9be3890.tar.bz2 |
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.
Diffstat (limited to 'newlib/libc/search')
-rw-r--r-- | newlib/libc/search/Makefile.am | 14 | ||||
-rw-r--r-- | newlib/libc/search/Makefile.in | 24 |
2 files changed, 18 insertions, 20 deletions
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am index defb6bb..98920c3 100644 --- a/newlib/libc/search/Makefile.am +++ b/newlib/libc/search/Makefile.am @@ -62,23 +62,11 @@ lib_a_CFLAGS = $(AM_CFLAGS) noinst_DATA = endif # USE_LIBTOOL -SUFFIXES = .def - CHEWOUT_FILES = \ bsearch.def \ qsort.def \ qsort_r.def -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str - -.c.def: - $(CHEW) < $< > $*.def 2> $*.ref - touch stmp-def - -TARGETDOC = ../tmp.texi - -doc: $(CHEWOUT_FILES) - -CLEANFILES = $(CHEWOUT_FILES) *.ref +CHAPTERS = include $(srcdir)/../../Makefile.shared diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in index 755ec8a..0b7672a 100644 --- a/newlib/libc/search/Makefile.in +++ b/newlib/libc/search/Makefile.in @@ -313,14 +313,18 @@ libsearch_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES) @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS) -SUFFIXES = .def CHEWOUT_FILES = \ bsearch.def \ qsort.def \ qsort_r.def -CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str -TARGETDOC = ../tmp.texi +CHAPTERS = + +# +# documentation rules +# +SUFFIXES = .def +CHEW = ${top_builddir}/../doc/makedoc -f $(top_srcdir)/../doc/doc.str CLEANFILES = $(CHEWOUT_FILES) *.ref all: all-am @@ -670,17 +674,23 @@ uninstall-am: mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am +objectlist.awk.in: $(noinst_LTLIBRARIES) + -rm -f objectlist.awk.in + for i in `ls *.lo` ; \ + do \ + echo $$i `pwd`/$$i >> objectlist.awk.in ; \ + done .c.def: $(CHEW) < $< > $*.def 2> $*.ref touch stmp-def +TARGETDOC ?= ../tmp.texi + doc: $(CHEWOUT_FILES) -objectlist.awk.in: $(noinst_LTLIBRARIES) - -rm -f objectlist.awk.in - for i in `ls *.lo` ; \ + for chapter in $(CHAPTERS) ; \ do \ - echo $$i `pwd`/$$i >> objectlist.awk.in ; \ + cat $(srcdir)/$$chapter >> $(TARGETDOC) ; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. |