X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=1b2e4fb1aed441cf7cbefb0a7169ca46e13f160a;hb=637e1f9c21e7b1d3b6f0b96ff266bfba40fa6d9a;hp=ec5d9f1483a89918d7402b6522d829d4254508c0;hpb=9eca2885c73e32b81b2ebe34e65fbdedc313c930;p=clsql.git

diff --git a/Makefile b/Makefile
index ec5d9f1..1b2e4fb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.11 2002/04/07 08:48:54 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.18 2002/05/13 03:24:41 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,29 +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 cmucl-compat
+DOCSUBDIRS:=doc
 
-.PHONY: all libs clean distclean dist-doc tagcvs dist
+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 {} \;
-	$(MAKE) -C doc $@
-	@for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
-
+.PHONY: distclean
 distclean: clean
-
-dist-doc:
-	$(MAKE) -C doc $@
+	@$(MAKE) -C doc $@
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -50,24 +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)
-	cvs -q tag -F $(TAG)
+.PHONY: doc
+doc:
+	$(MAKE) -C doc
+
+.PHONY:dist
+dist: clean
+	@$(MAKE) -C doc $@
 
-dist: distclean dist-doc tagcvs
-	@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)