X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=69e3b133b2f61934ddaa351929edc140ccf1134f;hb=4c9d08c9a27dab0df48a80b5301d9d6715107aa1;hp=e49037815265971cdac2b46b23d4c7d45ae81255;hpb=b0c7867ccdf61f1788b8ee8057b4113d5b5da84e;p=clsql.git

diff --git a/Makefile b/Makefile
index e490378..69e3b13 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.17 2002/04/28 11:00:11 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.20 2002/06/20 13:34:55 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,58 +15,36 @@
 
 PKG:=clsql
 DEBPKG=cl-sql
-SUBDIRS:=interfaces sql cmucl-compat
+SUBDIRS:=interfaces sql base
 DOCSUBDIRS:=doc
 
 include Makefile.common
 
-.PHONY: all libs clean distclean doc tagcvs dist wwwdist
-
 LIBSUBDIRS=interfaces/mysql interfaces/clsql-uffi
 .PHONY: subdirs $(LIBSUBDIRS)
 
+.PHONY: all
 all: $(LIBSUBDIRS)
 
 $(LIBSUBDIRS):
 	$(MAKE) -C $@
 
+.PHONY: distclean
 distclean: clean
+	@$(MAKE) -C doc $@
 
-VERSION=$(shell cat VERSION)
-DISTDIR=$(PKG)-$(VERSION)
-DIST_TARBALL=$(DISTDIR).tar.gz
-DIST_ZIP=$(DISTDIR).zip
 SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
 	COPYING.CLSQL COPYING.MaiSQL README INSTALL ChangeLog NEWS TODO \
 	set-logical.cl clsql-uffi.system \
 	clsql.system clsql-aodbc.system clsql-mysql.system \
 	clsql-postgresql.system clsql-postgresql-socket.system
 
-VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
-TAG=dist_$(VERSION_UNDERSCORE)
+.PHONY: doc
+doc:
+	$(MAKE) -C doc
 
-tagcvs:
-	@cvs -q rtag -d $(TAG) $(PKG) > /dev/null
-	@cvs -q tag -F $(TAG) > /dev/null
-
-dist: distclean tagcvs
+.PHONY:dist
+dist: clean
 	@$(MAKE) -C doc $@
-	@rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
-	@mkdir $(DISTDIR)
-	@cp -a $(SOURCE_FILES) $(DISTDIR)
-	@find $(DISTDIR) -type d -name CVS | xargs rm -r
-	@find $(DISTDIR) -type f -name .cvsignore -exec rm {} \;
-	@find $(DISTDIR) -type f -and -name \*.tex -or -name \*.aux -or \
-		 -name \*.log -or -name \*.out -or -name \*.dvi -or \
-		 -name \*~ -or -name \*.ps -or -name test.config | xargs rm -f
-	@tar czf $(DIST_TARBALL) $(DISTDIR)
-	@find $(DISTDIR) -type f -name \*.cl -or -name \*.list -or \
-		-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
-	@zip -rq $(DIST_ZIP) $(DISTDIR)
-	@rm -r $(DISTDIR)
 
-wwwdist: dist
-	@./copy
+