Remove PDF file on clean, have clean.sh invoke "make clean"

diff --git a/doc/Makefile b/doc/Makefile
index 93fe3fb..69e7bfc 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -105,9 +105,9 @@ ${TXTFILE}: ${FOFILE}
 .PHONY: clean
 clean: 
        @rm -f *~ *.bak *.orig \#*\# .\#* texput.log
-       @rm -rf html ${PSFILE} ${HTMLFILE} html-stamp
-       @rm -f ${TMPFILES} ${FOFILE}
-       @rm -f  ${DVIFILE} ${TXTFILE}
+       @rm -rf html $(PSFILE) $(HTMLFILE) $(PDFFILE) html-stamp
+       @rm -f $(TMPFILES) $(FOFILE)
+       @rm -f  $(DVIFILE) $(TXTFILE)
 
 .PHONY: distclean
 distclean: clean

diff --git a/doc/clean.sh b/doc/clean.sh
index 0ed3330..ef5008a 100644 (file)
--- a/doc/clean.sh
+++ b/doc/clean.sh
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-# Remove directories which are known to be generated for output only.
-rm -rf html/
+. ../find-gnumake.sh
+find_gnumake
 
-# Remove files whose suffixes indicate that they're generated (e.g.
-# HTML or PostScript) not source (DocBook/SGML, build scripts, etc.).
-find . \( \
-       -name '*.htm' -o \
-       -name '*.html' \) -print | xargs rm -f
+$GNUMAKE clean