From 9134ddaca99603756353e2dd329a0a42fdc2b50c Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Thu, 24 Mar 2005 17:05:13 +0000
Subject: [PATCH] * Makefile.in (NOMAKEDIRS): Add contrib/gdiffmk/tests.
 (dist): Search Makefile while descending into $(EXTRADIRS).

* doc/Makefile.in (.PHONY): Add.
(clean): Don't remove *.png and *.eps.
Don't handle *.gif.
(realclean): Remove *.png and *.eps.
(extraclean): Depend on distclean.
---
 ChangeLog       | 11 +++++++++++
 Makefile.in     | 12 +++++++++---
 doc/Makefile.in |  6 ++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 271a241d..dbaa10fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-03-24  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile.in (NOMAKEDIRS): Add contrib/gdiffmk/tests.
+	(dist): Search Makefile while descending into $(EXTRADIRS).
+
+	* doc/Makefile.in (.PHONY): Add.
+	(clean): Don't remove *.png and *.eps.
+	Don't handle *.gif.
+	(realclean): Remove *.png and *.eps.
+	(extraclean): Depend on distclean.
+
 2005-03-18  Larry Kollar  <kollar@alltel.net>
 
 	Add numbered and definition lists to www.tmac.
diff --git a/Makefile.in b/Makefile.in
index c03b70b3..623d7872 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
@@ -322,7 +322,7 @@ make_install_pdfdoc=@make_install_pdfdoc@
 # -DHAVE_STRUCT_EXCEPTION	if <math.h> defines struct exception
 # -DRETSIGTYPE=int		if signal handlers return int not void	
 # -DIS_EBCDIC_HOST		if the host's encoding is EBCDIC
-# -DPAGEA4			if the the printer's page size is A4
+# -DPAGE=A4			if the the printer's page size is A4
 # -DGHOSTSCRIPT=gs		the name (and directory if required) of the
 #				ghostscript program
 DEFINES=@DEFS@
@@ -566,6 +566,7 @@ NOMAKEDIRS=\
   contrib/mm/mm \
   contrib/mom/examples \
   contrib/mom/momdoc \
+  contrib/gdiffmk/tests \
   src/libs/snprintf
 DISTDIRS=\
   $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
@@ -694,7 +695,12 @@ dist:
 	$(MAKE) srcdir=. VPATH=. distfiles; \
 	$(MAKE) srcdir=. VPATH=. extraclean; \
 	for d in $(EXTRADIRS); do \
-	  (cd $$d; $(MAKE) extraclean); \
+	  (cd $$d; \
+	   if test -f Makefile; then \
+	     $(MAKE) extraclean; \
+	   else \
+	     $(MAKE) -f $(top_builddir)/$$d/Makefile extraclean; \
+	   fi); \
 	done; \
 	rm -f Makefile; \
 	$(LN_S) $$srcdir/Makefile.init Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index da3eb89b..18da219a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -82,6 +82,7 @@ GROFF=GROFF_COMMAND_PREFIX=''; \
 imagedir=img
 
 .SUFFIXES: .me .ms .ps .html .txt .texinfo .dvi .pdf
+.PHONY: all prepare_examples clean distclean realclean extraclean
 
 # For simplicity, we always call grn and eqn.
 .me.txt:
@@ -132,7 +133,7 @@ grnexmpl.ps: grnexmpl.me grnexmpl.g
 
 
 clean:
-	-rm -f *.ps *.html *.txt *.png *.eps *.gif *.dit core
+	-rm -f *.ps *.html *.txt core
 	-rm -f *.aux *.dvi *.pdf *.log *.toc texput.log
 	-rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \
                *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \
@@ -142,6 +143,7 @@ clean:
 distclean: clean
 
 realclean: distclean
+	-rm -f *.png *.eps
 
-extraclean: clean
+extraclean: distclean
 	-rm -f core *~ \#* junk temp grot
-- 
2.11.4.GIT