From ca6fc372dac273f6d61f1deaddf96d077cb1c47f Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 7 Apr 2002 09:25:04 +0000
Subject: [PATCH] r1764: *** empty log message ***

---
 Makefile     | 15 ++++++---------
 doc/Makefile |  6 ++++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index ec5d9f1..e5159cc 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.11 2002/04/07 08:48:54 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.12 2002/04/07 09:24:22 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,7 +15,7 @@
 
 PKG=clsql
 
-.PHONY: all libs clean distclean dist-doc tagcvs dist
+.PHONY: all libs clean distclean doc tagcvs dist
 
 SUBDIRS=interfaces/mysql interfaces/clsql-uffi
 .PHONY: subdirs $(SUBDIRS)
@@ -29,14 +29,10 @@ clean:
 	@rm -f $(PKG)-*.tar.gz $(PKG)-*.zip
 	@find . -type d -name .bin |xargs rm -rf 
 	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
-	$(MAKE) -C doc $@
 	@for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
 
 distclean: clean
 
-dist-doc:
-	$(MAKE) -C doc $@
-
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
 DIST_TARBALL=$(DISTDIR).tar.gz
@@ -51,10 +47,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: distclean dist-doc tagcvs
+dist: distclean tagcvs
+	@$(MAKE) -C doc $@
 	@rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
 	@mkdir $(DISTDIR)
 	@cp -a $(SOURCE_FILES) $(DISTDIR)
diff --git a/doc/Makefile b/doc/Makefile
index 1dde360..0ea0a99 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.4 2002/03/26 20:51:41 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.5 2002/04/07 09:24:22 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -55,9 +55,11 @@ DVIFILE=${DOCFILE_BASE}.dvi
 TMPFILES=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
 DOCFILES=$(shell echo *.sgml)
 
+.PHONY: all dist check html tex pdf ps clean distclean
+
 all: html pdf ps dvi
 
-dist-doc: html pdf
+dist: html pdf
 
 CHECK=nsgmls -s -C catalog || exit 1
 
-- 
2.34.1