aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-19 07:25:49 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-19 07:25:49 +0000
commitfef0b717d0287ab63a0f5a39dabf477c58182492 (patch)
treefbd20f595eb783bb206d955a6675ae73f21730c8
parent91099cf415727b7ff4a920913fabde84dcf7f8fa (diff)
downloadglibc-fef0b717d0287ab63a0f5a39dabf477c58182492.zip
glibc-fef0b717d0287ab63a0f5a39dabf477c58182492.tar.gz
glibc-fef0b717d0287ab63a0f5a39dabf477c58182492.tar.bz2
Update.
2001-07-19 Ulrich Drepper <drepper@redhat.com> * Makefile: Add html goal. * manual/Makefile: Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile4
-rw-r--r--manual/Makefile6
-rw-r--r--manual/charset.texi6
-rw-r--r--manual/lesser.texi4
5 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d110f66..9644815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-19 Ulrich Drepper <drepper@redhat.com>
+
+ * Makefile: Add html goal.
+ * manual/Makefile: Likewise.
+
2001-07-18 Ulrich Drepper <drepper@redhat.com>
* libio/filedoalloc.c (_IO_file_doallocate): A few more minor
diff --git a/Makefile b/Makefile
index f3c7e7b..0fe2919 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,8 @@ $(objpfx)glibcbug: $(common-objpfx)config.status glibcbug.in
cd $(<D) && CONFIG_FILES=$(@F) CONFIG_HEADERS= $(SHELL) $(<F)
# This makes the Info or DVI file of the documentation from the Texinfo source.
-.PHONY: info dvi pdf
-info dvi pdf:
+.PHONY: info dvi pdf html
+info dvi pdf html:
$(MAKE) $(PARALLELMFLAGS) -C manual $@
# This makes all the subdirectory targets.
diff --git a/manual/Makefile b/manual/Makefile
index 7f083d5..52c12ae 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -24,7 +24,7 @@ export subdir := $(subdir)
# Allow override
INSTALL_INFO = install-info
-.PHONY: all dvi pdf info
+.PHONY: all dvi pdf info html
all: dvi
dvi: libc.dvi
pdf: libc.pdf
@@ -76,6 +76,10 @@ chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi libm-err.texi
libc.dvi libc.pdf: texinfo.tex
+html: libc/index.html
+libc/index.html: chapters.texi top-menu.texi libm-err.texi
+ $(MAKEINFO) --html libc.texinfo
+
# Generate the summary from the Texinfo source files for each chapter.
summary.texi: stamp-summary ;
stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
diff --git a/manual/charset.texi b/manual/charset.texi
index 9068e42..39e2062 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -2465,7 +2465,7 @@ function and these define the interface.
@comment gconv.h
@comment GNU
-@deftypevr {Data type} int (*__gconv_init_fct) (struct __gconv_step *)
+@deftypevr {Data type} int {(*__gconv_init_fct)} (struct __gconv_step *)
This specifies the interface of the initialization function of the
module. It is called exactly once for each conversion the module
implements.
@@ -2621,7 +2621,7 @@ out completely.
@comment gconv.h
@comment GNU
-@deftypevr {Data type} void (*__gconv_end_fct) (struct gconv_step *)
+@deftypevr {Data type} void {(*__gconv_end_fct)} (struct gconv_step *)
The task of this function is it to free all resources allocated in the
initialization function. Therefore only the @code{__data} element of
the object pointed to by the argument is of interest. Continuing the
@@ -2644,7 +2644,7 @@ conversion function.
@comment gconv.h
@comment GNU
-@deftypevr {Data type} int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *, const char **, const char *, size_t *, int)
+@deftypevr {Data type} int {(*__gconv_fct)} (struct __gconv_step *, struct __gconv_step_data *, const char **, const char *, size_t *, int)
The conversion function can be called for two basic reason: to convert
text or to reset the state. From the description of the @code{iconv}
function it can be seen why the flushing mode is necessary. What mode
diff --git a/manual/lesser.texi b/manual/lesser.texi
index 3d5397c..778cbb5 100644
--- a/manual/lesser.texi
+++ b/manual/lesser.texi
@@ -1,7 +1,3 @@
-@setfilename lgpl.info
-
-@set lgpl-appendix
-
@ifset lgpl-appendix
@appendix GNU LESSER GENERAL PUBLIC LICENSE
@end ifset