X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=Makefile;h=06856d983f7a675c322c1883dd693152e522094c;hb=198526f1ab024d53c712dc63adf17184d7a70dfc;hp=081302d0a0220134dcea781b2e9d82d3c13486bb;hpb=d596034b6a258cc97f32c33508079db469c8af2a;p=uffi.git

diff --git a/Makefile b/Makefile
index 081302d..06856d9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.41 2002/04/28 02:28:45 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.47 2002/04/28 09:59:07 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -14,7 +14,8 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
 PKG:=uffi
-SUBDIRS:= examples src
+DEBPKG=cl-uffi
+SUBDIRS:= examples src benchmarks
 DOCSUBDIRS:=doc
 
 include Makefile.common
@@ -26,43 +27,35 @@ all:
 
 .PHONY: distclean
 distclean: clean
-	./debian/rules clean
+	@$(MAKE) -C doc $@
+#	./debian/rules clean
 
 
 VERSION=$(shell cat VERSION)
-DISTDIR=$(PKG)-$(VERSION)
-DIST_TARBALL=$(DISTDIR).tar.gz
-DIST_ZIP=$(DISTDIR).zip
-SOURCE_FILES=src doc examples Makefile uffi.system COPYRIGHT README TODO \
-	 INSTALL uffi.lsm ChangeLog NEWS test-examples.cl set-logical.cl \
+PKGNAME=$(PKG)-$(VERSION)
+DISTDIR=$(PKGNAME)
+DIST_TARBALL=$(PKGNAME).tar.gz
+DIST_ORIG_TARBALL=$(PKGNAME).orig.tar.gz
+DIST_ZIP=$(PKGNAME).zip
+SOURCE_FILES=src doc examples Makefile uffi.system benchmarks COPYRIGHT README \
+	 TODO INSTALL uffi.lsm ChangeLog NEWS test-examples.cl set-logical.cl 
 
 VERSION_UNDERSCORE=$(shell cat VERSION | tr . _)
-TAG=dist_$(VERSION_UNDERSCORE)
+TAG=upstream_version_$(VERSION_UNDERSCORE)
 
 .PHONY: tagcvs
 tagcvs:
 	@cvs -q rtag -d $(TAG) $(PKG) > /dev/null
 	@cvs -q tag -F $(TAG) > /dev/null
 
+.PHONY: doc
+doc:
+	$(MAKE) -C doc
+
 .PHONY: dist
-dist: distclean
+dist: clean
 	$(MAKE) -C doc $@
-	@rm -rf $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
-	@mkdir $(DISTDIR)
-	@cp -a $(SOURCE_FILES) $(DISTDIR)
-	@find $(DISTDIR) -type d -name CVS |xargs rm -rf
-	@find $(DISTDIR) -type f -name .cvsignore -exec rm {} \;
-	@find $(DISTDIR)/doc -type f -name \*.tex -or -name \*.aux -or \
-		 -name \*.log -or -name \*.out -or -name \*.dvi -or \
-		 -name \*~ -or -name \*.ps -exec rm {} \;
-	@tar czf $(DIST_TARBALL) $(DISTDIR)
-	@find $(DISTDIR) -type f -and -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)
+	@./make-dist.sh
 
 .PHONY: wwwdist
 wwwdist: dist
@@ -75,4 +68,8 @@ freeze:
 	cvs -q rtag -d frozen uffi
 	cvs -q tag -F frozen .
 
+.PHONY: cleandists
+cleandists:
+	@rm -rf ../${PKG}-*.tar.gz ../${PKG}-*.zip
+	@rm -rf ../$(DEBPKG)_*gz ../${DEBPKG}*.changes ../${DEBPKG}*.deb ../${DEBPKG}*.dsc