r1623: *** empty log message ***

diff --git a/Makefile b/Makefile
index 52b3aab80b5ebccb0758def08ff210fead8494b5..ca29dff9ed1fc38189b8f82b2217a3481cacd644 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.28 2002/03/21 16:47:59 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.29 2002/03/23 04:00:40 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -20,37 +20,32 @@ nothing:
 
 clean:
        @rm -f uffi-*.tar.gz uffi-*.zip
-       @find . -type f -name \*.fasl -exec rm {} \;
-       @find . -type f -name \*.fsl -exec rm {} \;
-       @find . -type d -name .bin |xargs rm -rf 
+       @find . -type d -name .bin -exec rm -rf {} \;
 
 realclean: clean
-       @find . -type f -name \*~ -exec rm {} \;
-       @find . -type f -name "#*#" -exec rm {} \;
+       @find . -type f -name "#*" -or -name \*~ -exec rm {} \;
 
 docs:
        @(cd doc; make dist-doc)
 
-VERSION=0.2.12
-DISTDIR=uffi-${VERSION}
-DIST_TARBALL=${DISTDIR}.tar.gz
-DIST_ZIP=${DISTDIR}.zip
+VERSION=$(shell cat VERSION)
+DISTDIR=uffi-$(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 \
-       benchmarks
+        benchmarks VERSION
 
 dist: realclean docs
-       @rm -fr ${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 |xargs rm -rf
-       @tar czf ${DIST_TARBALL} ${DISTDIR}
-       @find ${DISTDIR} -type f -exec unix2dos -q {} \;
-       @zip -rq ${DIST_ZIP} ${DISTDIR}
-       @rm -r ${DISTDIR}
-
-FTP_DIR=/home/ftp/pub/uffi
-
-dist-to-ftp: dist
-       @cp ${DIST_TARBALL} ${DIST_ZIP} ${FTP_DIR}
+       @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 -exec unix2dos -q {} \;
+       @zip -rq $(DIST_ZIP) $(DISTDIR)
+       @rm -r $(DISTDIR)

diff --git a/VERSION b/VERSION
new file mode 100644 (file)
index 0000000..2779245
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.2.13

diff --git a/doc/Makefile b/doc/Makefile
index 874c1ef439eab381a2b7a702e55edb894446834c..27e0ad19b500734bbb84698b5c9417e8ca5604a1 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/03/14 21:03:12 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.7 2002/03/23 04:00:40 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -54,21 +54,22 @@ PSFILE=${DOCFILE_BASE}.ps
 DVIFILE=${DOCFILE_BASE}.dvi
 TMPFILES=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
 
+all: html pdf ps dvi
+
 dist-doc: html pdf
-       @rm -f ${DVIFILE} ${PSFILE} ${TEXFILE}
-       @rm -f *~
 
-all: html pdf ps dvi
+CHECK=nsgmls -s -C catalog || exit 1
 
-check:
-       nsgmls -s -C catalog || exit 1
+html: html/book1.htm
 
-html: check ${DOCFILE}
+html/book1.htm: ${DOCFILE} 
+       $(CHECK)
        ( rm -rf html ; mkdir html; cd html ; jade -t sgml -c ../catalog -d ${DSSSL_HTML} ../${DOCFILE}; mv book1.htm manual.htm; cd ..)
 
 tex: ${TEXFILE}
 
-${TEXFILE}: check ${DOCFILE}
+${TEXFILE}: ${DOCFILE}
+       $(CHECK)
        jade -t tex -c catalog -d ${DSSSL_PRINT} ${DOCFILE}
 
 pdf: ${PDFFILE}
@@ -78,7 +79,6 @@ ${PDFFILE}: ${TEXFILE}
        pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}'
        pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}'
        pdfjadetex '\pdfcompresslevel=9' '\input ${TEXFILE}'
-       @rm -f ${TMPFILES}
 
 dvi: ${DVIFILE}
 
@@ -87,7 +87,6 @@ ${DVIFILE}: ${TEXFILE}
        jadetex ${TEXFILE}
        jadetex ${TEXFILE}
        jadetex ${TEXFILE}
-       @rm -f ${TMPFILES}
 
 ps: ${PSFILE}
 
@@ -97,7 +96,7 @@ ${PSFILE}: ${DVIFILE}
 clean:
        @rm -rf html
        @rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE}
-       @rm -f ${TMPFILE}
+       @rm -f ${TMPFILES}
 
 realclean: clean
        @rm -f *~