X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=131c68940c3d9ded8bed94682a84dcd2d390e85c;hb=d302d2db4f7ff7a31bce893e31aecbc2a84a162f;hp=684ecc82ff765e6e8f9c56e791d7ea0e95059f9e;hpb=ec49f5551cb77138ffcefc00a690f113e4535588;p=clsql.git

diff --git a/Makefile b/Makefile
index 684ecc8..131c689 100644
--- 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.15 2002/04/27 20:58:11 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,29 +15,23 @@
 
 PKG=clsql
 
-.PHONY: all libs clean realclean doc tagcvs dist
+.PHONY: all libs clean distclean doc tagcvs dist wwwdist
 
-SUBDIRS=interfaces/mysql interfaces/clsql-uffi
-.PHONY: subdirs $(SUBDIRS)
+LIBSUBDIRS=interfaces/mysql interfaces/clsql-uffi
+.PHONY: subdirs $(LIBSUBDIRS)
 
-all: $(SUBDIRS)
+all: $(LIBSUBDIRS)
 
-$(SUBDIRS):
+$(LIBSUBDIRS):
 	$(MAKE) -C $@
 
 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 $(LIBSUBDIRS) ; 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)
@@ -70,6 +65,9 @@ dist: realclean docs tagcvs
 		-name \*.system -or -name Makefile -or -name ChangeLog -or \
 		-name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL \
 		-or -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog \
-		| xargs unix2dos -q
+		| xargs unix2dos
 	@zip -rq $(DIST_ZIP) $(DISTDIR)
 	@rm -r $(DISTDIR)
+
+wwwdist: dist
+	@./copy