From 1207d757f2f76828aa99ff30b465472ee58c137f Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Sat, 17 Mar 2001 22:51:41 +0000
Subject: [PATCH] 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.
---
 docs/reference/ChangeLog                  | 5 +++++
 docs/reference/Makefile.am                | 2 +-
 docs/reference/glib/Makefile.am           | 4 ++--
 docs/reference/glib/tmpl/macros_misc.sgml | 1 -
 docs/reference/gobject/Makefile.am        | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1b361d0f7..c88e9bc55 100644
--- 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 e84e1506b..c5c7e965a 100644
--- 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 6aaaf8fb7..34909c3e3 100644
--- 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 994ffb730..a7768c733 100644
--- 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 d34051167..aa83c051a 100644
--- 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 \