X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=3fca75588ae2737cea3a4c6b5a4e81da5ae47a8f;hb=949ecae2e659ee76895debdf3e6b6bf01c7a4e3b;hp=3c1d5a983ee991aa8643441a182a46333fb50dec;hpb=b4f641e256405778029888b10727095ce35055e0;p=clsql.git

diff --git a/Makefile b/Makefile
index 3c1d5a9..3fca755 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/04/06 19:54:14 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.16 2002/04/28 10:58:07 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,28 +13,33 @@
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
-PACKAGE=clsql
+PKG:=clsql
+DEBPKG=cl-sql
+SUBDIRS:=interfaces sql cmucl-compat
+DOCSUBDIRS:=doc
 
-all: libs
+include Makefile.common
 
-libs:
-	(cd interfaces/mysql; make)
-	(cd interfaces/clsql-uffi; make)
+.PHONY: all libs clean distclean doc tagcvs dist wwwdist
+
+LIBSUBDIRS=interfaces/mysql interfaces/clsql-uffi
+.PHONY: subdirs $(LIBSUBDIRS)
+
+all: $(LIBSUBDIRS)
+
+$(LIBSUBDIRS):
+	$(MAKE) -C $@
 
 clean:
-	@rm -f $(PACKAGE)-*.tar.gz $(PACKAGE)-*.zip
+	@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 \*~ -exec rm {} \;
-	@find . -type f -name "#*#" -exec rm {} \;
+	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
+	@for i in $(LIBSUBDIRS) ; do $(MAKE) -C $$i $@ ; done
 
-docs:
-	@(cd doc; make dist-doc)
+distclean: clean
 
 VERSION=$(shell cat VERSION)
-DISTDIR=$(PACKAGE)-$(VERSION)
+DISTDIR=$(PKG)-$(VERSION)
 DIST_TARBALL=$(DISTDIR).tar.gz
 DIST_ZIP=$(DISTDIR).zip
 SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
@@ -43,7 +48,15 @@ SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
 	clsql.system clsql-aodbc.system clsql-mysql.system \
 	clsql-postgresql.system clsql-postgresql-socket.system
 
-dist: realclean docs
+VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
+TAG=dist_$(VERSION_UNDERSCORE)
+
+tagcvs:
+	@cvs -q rtag -d $(TAG) $(PKG) > /dev/null
+	@cvs -q tag -F $(TAG) > /dev/null
+
+dist: distclean tagcvs
+	@$(MAKE) -C doc $@
 	@rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
 	@mkdir $(DISTDIR)
 	@cp -a $(SOURCE_FILES) $(DISTDIR)
@@ -57,6 +70,9 @@ dist: realclean docs
 		-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