r1826: *** empty log message ***

[clsql.git] / Makefile

diff --git a/Makefile b/Makefile
index ec5d9f1483a89918d7402b6522d829d4254508c0..3fca75588ae2737cea3a4c6b5a4e81da5ae47a8f 100644 (file)
--- 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.16 2002/04/28 10:58:07 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,30 +13,31 @@
 # 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)
+.PHONY: all libs clean distclean doc tagcvs dist wwwdist
 
-all: $(SUBDIRS)
+LIBSUBDIRS=interfaces/mysql interfaces/clsql-uffi
+.PHONY: subdirs $(LIBSUBDIRS)
 
-$(SUBDIRS):
+all: $(LIBSUBDIRS)
+
+$(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
+       @for i in $(LIBSUBDIRS) ; do $(MAKE) -C $$i $@ ; done
 
 distclean: clean
 
-dist-doc:
-       $(MAKE) -C doc $@
-
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
 DIST_TARBALL=$(DISTDIR).tar.gz
@@ -51,10 +52,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: distclean dist-doc tagcvs
+dist: distclean tagcvs
+       @$(MAKE) -C doc $@
        @rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
        @mkdir $(DISTDIR)
        @cp -a $(SOURCE_FILES) $(DISTDIR)
@@ -68,6 +70,9 @@ dist: distclean dist-doc 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