X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=01d6ee9f0a7cac74483d9e11b871e1f8c596cb5e;hb=a8074fe2035d97f5178c41104dd44c839987c380;hp=197ccd9bcfb9e3c9547cdec348dedc6154d7c749;hpb=d48b43edb4d356a20b20762f803370e7fc975bf3;p=clsql.git

diff --git a/Makefile b/Makefile
index 197ccd9..01d6ee9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.9 2002/04/07 07:55:29 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.14 2002/04/23 21:32:25 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,24 +15,23 @@
 
 PKG=clsql
 
-.PHONY: all libs clean realclean docs tagcvs dist
+.PHONY: all libs clean distclean doc tagcvs dist wwwdist
 
-all: libs
+SUBDIRS=interfaces/mysql interfaces/clsql-uffi
+.PHONY: subdirs $(SUBDIRS)
 
-libs:
-	(cd interfaces/mysql; make)
-	(cd interfaces/clsql-uffi; make)
+all: $(SUBDIRS)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
 
 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 
-
-realclean: clean
 	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
+	@for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
 
-docs:
-	@(cd doc; make dist-doc)
+distclean: clean
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -48,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)
@@ -65,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