r1764: *** empty log message ***

[clsql.git] / Makefile

diff --git a/Makefile b/Makefile
index 684ecc82ff765e6e8f9c56e791d7ea0e95059f9e..e5159ccce9de6aa403415a4160381057cbeeef25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.10 2002/04/07 08:09:11 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 realclean doc tagcvs dist
+.PHONY: all libs clean distclean doc tagcvs dist
 
 SUBDIRS=interfaces/mysql interfaces/clsql-uffi
 .PHONY: subdirs $(SUBDIRS)
@@ -28,16 +28,10 @@ $(SUBDIRS):
 clean:
        @rm -f $(PKG)-*.tar.gz $(PKG)-*.zip
        @find . -type d -name .bin |xargs rm -rf 
-       $(MAKE) -C doc clean
-       for i in $(SUBDIRS) ; do \
-               $(MAKE) -C $$i clean; \
-       done
-
-realclean: clean
        @find . -type f -name "#*" -or -name \*~ -exec rm {} \;
+       @for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
 
-doc:
-       $(MAKE) -C doc dist-doc
+distclean: clean
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -53,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: realclean docs tagcvs
+dist: distclean tagcvs
+       @$(MAKE) -C doc $@
        @rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
        @mkdir $(DISTDIR)
        @cp -a $(SOURCE_FILES) $(DISTDIR)