A couple of small fixes.

Sat Mar 17 17:51:17 2001  Owen Taylor  <otaylor@redhat.com>

	* gobject/Makefile.am glib/Makefile.am: A couple
        of small fixes.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1b361d0f796a29592b4dcb6ad94e93e215cad1e5..c88e9bc55c4ab537e56d30b586bc5fc023a427ce 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 17 17:51:17 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gobject/Makefile.am glib/Makefile.am: A couple
+       of small fixes.
+
 2001-03-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/tmpl/threads.sgml: Spelling corrections.

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index e84e1506b6e19cba37ad311f1e2d41aa3aeecaef..c5c7e965ab3cbf48fa461cc1f8eb65c1b91d99ad 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1 +1 @@
-SUBDIRS = glib gobject
\ No newline at end of file
+SUBDIRS = glib gobject

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 6aaaf8fb74f4fc7febbbe6f1981619fd1c860582..34909c3e37182c165ac837018d62d053742dc83c 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -79,7 +79,7 @@ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
 SCANOBJ_FILES =                \
        $(DOC_MODULE).args      \
        $(DOC_MODULE).hierarchy \
-       $(DOC_MODULE).signal
+       $(DOC_MODULE).signals
 
 if ENABLE_GTK_DOC
 all-local: html-build.stamp
@@ -89,7 +89,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB)
        @echo '*** Scanning header files ***'
        cd $(srcdir) && ( \
-       if grep -l '^..+$$' $(DOC_MODULE).types > /dev/null ; then \
+       if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
        else \
            for i in $(SCANOBJ_FILES) ; do \

diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index 994ffb73084ffa3a8f1eff2538277a36cd181022..a7768c73393efb09ae48e1ac2e2ca7ed613baed0 100644 (file)
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -66,7 +66,6 @@ only one statement is expected by the compiler.
 Portable way to copy <type>va_list</type> variables.
 </para>
 
-<!-- # Unused Parameters # -->
 @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
 @ap2: a <type>va_list</type>.
 

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index d3405116749868ef72debe4e4f4e07b62b23828e..aa83c051aa6e1f79a35e4026a0b97a011d07f43b 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -69,7 +69,7 @@ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
 SCANOBJ_FILES =                \
        $(DOC_MODULE).args      \
        $(DOC_MODULE).hierarchy \
-       $(DOC_MODULE).signal
+       $(DOC_MODULE).signals
 
 if ENABLE_GTK_DOC
 all-local: html-build.stamp
@@ -79,7 +79,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB)
        @echo '*** Scanning header files ***'
        cd $(srcdir) && ( \
-       if grep -l '^..+$$' $(DOC_MODULE).types > /dev/null ; then \
+       if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
        else \
            for i in $(SCANOBJ_FILES) ; do \