From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 7 Apr 2002 09:12:35 +0000 (+0000)
Subject: r1762: *** empty log message ***
X-Git-Tag: v1.6.1~497
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=1d4d51143ec97660790555812a25a26fbeea7537

r1762: *** empty log message ***
---

diff --git a/Makefile b/Makefile
index 1ba51f9..057df63 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.35 2002/04/07 09:06:42 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.36 2002/04/07 09:12:35 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,7 +15,7 @@
 
 PKG=uffi
 
-.PHONY: all clean realclean distdoc tagcvs dist wwwdist
+.PHONY: all clean realclean tagcvs dist wwwdist
 
 all: 
 
@@ -23,13 +23,12 @@ clean:
 	@rm -f $(PKG)-*.tar.gz $(PKG)-*.zip
 	@find . -type d -name .bin |xargs rm -rf 
 	@find . -type f -name \*.a -or -name \*.so |xargs rm -rf 
-	$(MAKE) -C doc clean
-
-realclean: clean
 	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
+	@$(MAKE) -C doc $@
+
+distclean: clean
+	@$(MAKE) -C doc $@
 
-distdoc:
-	$(MAKE) -C doc dist-doc
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -42,10 +41,11 @@ VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
 TAG=dist_$(VERSION_UNDERSCORE)
 
 tagcvs:
-	cvs -q rtag -d $(TAG) $(PKG)
-	cvs -q tag -F $(TAG)
+	cvs -q rtag -d $(TAG) $(PKG) > /dev/null
+	cvs -q tag -F $(TAG) /dev/null
 
-dist: realclean distdoc tagcvs
+dist: distclean tagcvs
+	$(MAKE) doc $@
 	@rm -rf $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
 	@mkdir $(DISTDIR)
 	@cp -a $(SOURCE_FILES) $(DISTDIR)
diff --git a/doc/Makefile b/doc/Makefile
index d2f56e0..b887aad 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.10 2002/04/06 19:23:04 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.11 2002/04/07 09:12:35 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -55,54 +55,53 @@ DVIFILE=${DOCFILE_BASE}.dvi
 TMPFILES=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
 DOCFILES=$(shell echo *.sgml)
 
-all: html pdf ps dvi
+.PHONY: all dist check html tex pdf ps distclean
 
-dist-doc: html pdf
+all: html pdf ps dvi
 
-CHECK=nsgmls -s -C catalog || exit 1
+dist: html pdf
 
 check:
-	$(CHECK)
+	nsgmls -s -C catalog || exit 1
 
 html: html/book1.htm
 
-html/book1.htm: ${DOCFILES} 
-	$(CHECK)
-	( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../catalog -d ${DSSSL_HTML} ../${DOCFILE}; cd ..)
+html/book1.htm: ${DOCFILES} check
+	@( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../catalog -d ${DSSSL_HTML} ../${DOCFILE}; cd ..)
 
 tex: ${TEXFILE}
 
-${TEXFILE}: ${DOCFILES}
-	$(CHECK)
+${TEXFILE}: ${DOCFILES} check
 	jade -t tex -c catalog -d ${DSSSL_PRINT} ${DOCFILE}
 
 pdf: ${PDFFILE}
 
 ${PDFFILE}: ${TEXFILE}
-	pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
-	pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
-	pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
-	pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
+	@pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
+	@pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
+	@pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
+	@pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}' > /dev/null
 
 dvi: ${DVIFILE}
 
 ${DVIFILE}: ${TEXFILE}
-	jadetex ${TEXFILE}
-	jadetex ${TEXFILE}
-	jadetex ${TEXFILE}
-	jadetex ${TEXFILE}
+	@jadetex ${TEXFILE}
+	@jadetex ${TEXFILE}
+	@jadetex ${TEXFILE}
+	@jadetex ${TEXFILE}
 
 ps: ${PSFILE}
 
 ${PSFILE}: ${DVIFILE}
-	dvips -o ${PSFILE} ${DVIFILE}
+	@dvips -o ${PSFILE} ${DVIFILE}
 
 clean:
 	@rm -rf html
 	@rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE}
-	@rm -f ${TMPFILES}
+	@rm -f ${TMPFILES} *~
+	@rm -f
+
+distclean: clean
 
-realclean: clean
-	@rm -f *~