From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 9 Feb 2003 12:36:31 +0000 (+0000)
Subject: * doc/Makefile: small fix for install; use clean.mk again
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=cf8d385149b91a4ff4d0064ef448df495f0a7279;p=fw%2Fsdcc

* doc/Makefile: small fix for install; use clean.mk again
* doc/clean.mk: clean *.pdf and *.html too


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2231 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 3404cf08..ca3fe440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2003-02-09  Bernhard Held <bernhard@bernhardheld.de>
 
 	* src/SDCCmain.c: signal handling is switched off by --debug
+	* doc/Makefile: small fix for install; use clean.mk again
+	* doc/clean.mk: clean *.pdf and *.html too
 
 2003-02-08  Bernhard Held <bernhard@bernhardheld.de>
 
diff --git a/doc/Makefile b/doc/Makefile
index 6c397044..2e15986b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,7 +8,10 @@ all: $(MANUAL).html $(MANUAL).pdf $(MANUAL).txt \
 
 install:
 	$(INSTALL) -d $(docdir)
-	cp -rf *.html *.txt *.pdf $(MANUAL).html $(TSS).html z80 avr $(docdir)
+	cp -rf *.html *.txt z80 avr $(docdir)
+	$(shell if [ -f $(MANUAL).html ]; then cp -rf $(MANUAL).html $(docdir); fi)
+	$(shell if [ -f $(TSS).html    ]; then cp -rf $(TSS).html    $(docdir); fi)
+	$(shell if [ -f *.pdf          ]; then cp -rf *.pdf          $(docdir); fi)
 
 uninstall:
 	rm -rf $(docdir)
@@ -25,7 +28,7 @@ $(TSS).html: $(TSS).tex
 %.txt: %.lyx
 	lyx -e text $<
 
-%.pdf: %.tex %.dvi
+%.pdf: %.dvi
 	which pdflatex > /dev/null && pdflatex $* || dvipdf $*
 
 %.dvi: %.tex
@@ -41,24 +44,4 @@ $(TSS).html: $(TSS).tex
 	# the glossary, not implemented yet
 	# makeindex -s l2hglo.ist -o $@ $<
 
-# Deleting all files created by building the program
-# --------------------------------------------------
-clean:
-# The directories are still in CVS, so don't delete them
-#	rm -rf $(MANUAL).html $(TSS).html
-	rm -f $(MANUAL).html/* $(TSS).html/*
-	rm -f $(MANUAL).txt $(TSS).txt *.pdf *.dvi *.tex *.ind *.glo *.aux *.idx *.ilg *.log *.toc
-
-# Deleting all files created by configuring or building the program
-# -----------------------------------------------------------------
-distclean: clean
-
-# Like clean but some files may still exist
-# -----------------------------------------
-mostlyclean: clean
-
-# Deleting everything that can reconstructed by this Makefile. It deletes
-# everything deleted by distclean plus files created by bison, etc.
-# -----------------------------------------------------------------------
-realclean: distclean
-
+include clean.mk
diff --git a/doc/clean.mk b/doc/clean.mk
index 2e7d978a..c3a85bda 100644
--- a/doc/clean.mk
+++ b/doc/clean.mk
@@ -1,11 +1,19 @@
-# remove intermediate file, not the final pdf's and html's
-# because these are needed for the distribution
 clean:
-	rm -rf *.tex *.aux *.dvi *.idx *.ilg *.ind *.log *.toc *~ \#* \
-		*.ps */*.css */*.pl *.gif core
+# The directories are still in CVS, so don't delete them
+#       rm -rf $(MANUAL).html $(TSS).html
+	rm -f $(MANUAL).html/* $(TSS).html/*
+	rm -rf $(MANUAL).txt $(TSS).txt *.pdf *.tex *.aux *.dvi *.idx *.ilg \
+		*.ind *.log *.toc *~ \#* *.ps */*.css */*.pl *.gif core *.glo
 
-# now get rid of the generated pdf's and html's as well
-superclean: clean
-	rm -rf *.pdf $(MANUAL).html $(TSS).html
+# Deleting all files created by configuring or building the program
+# -----------------------------------------------------------------
+distclean: clean
 
-distclean: superclean
+# Like clean but some files may still exist
+# -----------------------------------------
+mostlyclean: clean
+
+# Deleting everything that can reconstructed by this Makefile. It deletes
+# everything deleted by distclean plus files created by bison, etc.
+# -----------------------------------------------------------------------
+realclean: distclean