X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=Makefile;h=d64e82277e7aa40fd4578e376116cbf567785884;hp=e5159ccce9de6aa403415a4160381057cbeeef25;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hpb=ca6fc372dac273f6d61f1deaddf96d077cb1c47f

diff --git a/Makefile b/Makefile
index e5159cc..d64e822 100644
--- a/Makefile
+++ b/Makefile
@@ -5,66 +5,44 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.12 2002/04/07 09:24:22 kevin Exp $
+#  CVS Id:   $Id$
 #
-# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 #
 # CLSQL users are granted the rights to distribute and use this software
 # 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	:= sql tests uffi db-mysql db-aodbc db-odbc \
+	   db-postgresql db-postgresql-socket db-sqlite \
+           db-oracle 
+DOCSUBDIRS:=doc
 
-.PHONY: all libs clean distclean doc tagcvs dist
+include Makefile.common
 
-SUBDIRS=interfaces/mysql interfaces/clsql-uffi
-.PHONY: subdirs $(SUBDIRS)
+LIBSUBDIRS=db-mysql 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
-
-distclean: clean
-
-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)
-
-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)
+
+