X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=5e2958182686c73cdc5d1bf7eed601e13fdd6fbb;hb=27635f61adae5a49f9986762acf13daa0437826b;hp=763758be50de2a717378214618640aaa129266aa;hpb=85bea951e6119321ee7ed5c533a73f7261570d90;p=clsql.git

diff --git a/Makefile b/Makefile
index 763758b..5e29581 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.13 2002/04/07 09:26:20 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.19 2002/05/15 17:10:28 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,25 +13,25 @@
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
-PKG=clsql
+PKG:=clsql
+DEBPKG=cl-sql
+SUBDIRS:=interfaces sql base
+DOCSUBDIRS:=doc
 
-.PHONY: all libs clean distclean doc tagcvs dist wwwdist
+include Makefile.common
 
-SUBDIRS=interfaces/mysql interfaces/clsql-uffi
-.PHONY: subdirs $(SUBDIRS)
+LIBSUBDIRS=interfaces/mysql interfaces/clsql-uffi
+.PHONY: subdirs $(LIBSUBDIRS)
 
-all: $(SUBDIRS)
+.PHONY: all
+all: $(LIBSUBDIRS)
 
-$(SUBDIRS):
+$(LIBSUBDIRS):
 	$(MAKE) -C $@
 
-clean:
-	@rm -f $(PKG)-*.tar.gz $(PKG)-*.zip
-	@find . -type d -name .bin |xargs rm -rf 
-	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
-	@for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
-
+.PHONY: distclean
 distclean: clean
+	@$(MAKE) -C doc $@
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -46,28 +46,11 @@ SOURCE_FILES=interfaces sql cmucl-compat doc test-suite Makefile VERSION \
 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
+.PHONY: doc
+doc:
+	$(MAKE) -C doc
 
-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 -q
-	@zip -rq $(DIST_ZIP) $(DISTDIR)
-	@rm -r $(DISTDIR)
 
-wwwdist: dist
-	@./copy