aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:31 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:31 -0800
commit5145dd3aa0c02c9fc496d1432fc4410674206e1d (patch)
tree540afc30c51da085f5bd8ec3f4c89f6496e7900d /Makefile
parent8466d8cfa486fb30d1755c4261b781135083787b (diff)
downloadslib-5145dd3aa0c02c9fc496d1432fc4410674206e1d.tar.gz
slib-5145dd3aa0c02c9fc496d1432fc4410674206e1d.zip
Import Upstream version 3a2upstream/3a2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile190
1 files changed, 110 insertions, 80 deletions
diff --git a/Makefile b/Makefile
index 6739f4e..9b85c33 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@ intro:
@echo
-make slib.info
-include srcdir.mk
srcdir.mk: .. Makefile
- echo -e "srcdir = `pwd`/\n" > srcdir.mk
+ echo "srcdir = `pwd`/" > srcdir.mk
#srcdir=$(HOME)/slib/
+include srcdir.mk
-VERSION = 3a1
+VERSION = 3a2
RELEASE = 1
rpm_prefix=/usr/src/redhat/
@@ -25,6 +25,10 @@ exec_prefix = $(prefix)
# directory where `make install' will put executable.
bindir = $(exec_prefix)bin/
libdir = $(exec_prefix)lib/
+libslibdir = $(libdir)slib/
+# directory where `make install' will put manual page.
+mandir = $(prefix)man/
+man1dir = $(mandir)man1/
infodir = $(prefix)info/
PREVDOCS = prevdocs/
@@ -33,9 +37,10 @@ htmldir=../public_html/
dvidir=../dvi/
RUNNABLE = scheme48
+S48INIT = scheme48.init
LIB = $(libdir)$(RUNNABLE)/
VM = scheme48vm
-IMAGE = slib.image
+IMAGE48 = slib.image
INSTALL_DATA = install -c
$(LIB)slibcat:
@@ -45,66 +50,39 @@ catalogs:
-if type scm; then scm -c "(require 'new-catalog)"; fi
-if type guile; then guile -l guile.init -c\
"(use-modules (ice-9 slib)) (require 'new-catalog)"; fi
- -if type umb-scheme; then export SCHEME_INIT=umbscheme.init;\
+ -if type umb-scheme; then SCHEME_INIT=umbscheme.init;export SCHEME_INIT;\
echo "(require 'new-catalog)" | umb-scheme; fi
- -if type mzscheme; then export SCHEME_LIBRARY_PATH=`pwd`/;\
+ -if type mzscheme; then SCHEME_LIBRARY_PATH=`pwd`/;export SCHEME_LIBRARY_PATH;\
mzscheme -g -f DrScheme.init -e "(require 'new-catalog)" </dev/null; fi
-if type scheme48; then make install48; fi
MKNMDB = (require 'color-database) (make-slib-color-name-db) (slib:exit)
clrnamdb: clrnamdb.scm
-clrnamdb.scm: mkclrnam.scm Makefile
+clrnamdb.scm: mkclrnam.scm color.scm resenecolours.txt saturate.txt nbs-iscc.txt
if type scm; then scm -e"$(MKNMDB)";\
elif type guile; then guile -l guile.init -c\
"(use-modules (ice-9 slib)) $(MKNMDB)";\
elif type slib48; then echo -e "$(MKNMDB)\n,exit" | slib48 -h 3000000;\
- elif type umb-scheme; then export SCHEME_INIT=`pwd`/umbscheme.init;\
+ elif type umb-scheme; then SCHEME_INIT=`pwd`/umbscheme.init;export SCHEME_INIT;\
echo "$(MKNMDB)" | umb-scheme;\
- elif type mzscheme; then export SCHEME_LIBRARY_PATH=`pwd`/;\
+ elif type mzscheme; then SCHEME_LIBRARY_PATH=`pwd`/;export SCHEME_LIBRARY_PATH;\
echo "$(MKNMDB)" | mzscheme -f DrScheme.init;\
fi
-slib48: $(IMAGE)
-$(IMAGE): Makefile scheme48.init
- export S48_VERSION="`echo ,exit | scheme48 | sed -n 's/Welcome to Scheme 48 //;s/ ([^)]*)[.]//;p;q'`";\
- export S48_VICINITY="$(LIB)";\
- export SCHEME_LIBRARY_PATH="`pwd`/";\
- scheme48 < scheme48.init
-install48: $(IMAGE)
- $(INSTALL_DATA) $(IMAGE) $(LIB)
+slib48: $(IMAGE48)
+$(IMAGE48): Makefile $(S48INIT)
+ S48_VERSION="`echo ,exit | $(RUNNABLE) | sed -n 's/Welcome to Scheme 48 //;s/ ([^)]*)[.]//;p;q'`";export S48_VERSION;\
+ S48_VICINITY="$(LIB)";export S48_VICINITY;\
+ SCHEME_LIBRARY_PATH="`pwd`/";export SCHEME_LIBRARY_PATH;\
+ $(RUNNABLE) < $(S48INIT)
+install48: $(IMAGE48)
+ $(INSTALL_DATA) $(IMAGE48) $(LIB)
(echo '#! /bin/sh';\
- echo exec $(RUNNABLE) -i '$(LIB)$(IMAGE)' \"\$$\@\") \
+ echo exec $(RUNNABLE) -i '$(LIB)$(IMAGE48)' \"\$$\@\") \
> $(bindir)slib48
chmod +x $(bindir)slib48
-install:
- test -d $(bindir) || mkdir $(bindir)
- echo '#! /bin/sh' > $(bindir)slib
- echo export SCHEME_LIBRARY_PATH=$(libdir)slib/ >> $(bindir)slib
- echo VERSION=$(VERSION) >> $(bindir)slib
- cat slib.sh >> $(bindir)slib
- chmod +x $(bindir)slib
-
-#### Stuff for maintaining SLIB below ####
-
-ver = $(VERSION)
-version.txi: Makefile
- echo @set SLIBVERSION $(ver) > version.txi
- echo @set SLIBDATE `date +"%B %Y"` >> version.txi
-
-scheme = scm
-
-collect.sc:
- echo "(require 'macros-that-work)" > collect.sc
- echo "(require 'pprint-file)" >> collect.sc
- echo "(require 'yasos)" >> collect.sc
- echo "(pprint-filter-file \"collect.scm\" macwork:expand \"collectx.scm\")" >> collect.sc
- echo "(slib:exit #t)" >> collect.sc
-
-collectx.scm: collect.scm macwork.scm collect.sc
- $(scheme) < collect.sc
-
-ffiles = printf.scm genwrite.scm pp.scm \
+ffiles = format.scm printf.scm genwrite.scm pp.scm \
ppfile.scm strcase.scm debug.scm trace.scm \
strport.scm scanf.scm qp.scm break.scm stdio.scm \
strsrch.scm prec.scm schmooz.scm defmacex.scm mbe.scm
@@ -112,8 +90,8 @@ lfiles = sort.scm comlist.scm logical.scm
revfiles = sc4opt.scm sc4sc3.scm sc2.scm mularg.scm mulapply.scm \
trnscrpt.scm withfile.scm dynwind.scm promise.scm \
values.scm eval.scm null.scm
-afiles = charplot.scm root.scm cring.scm \
- selfset.scm psxtime.scm cltime.scm timezone.scm tzfile.scm
+afiles = charplot.scm root.scm cring.scm selfset.scm \
+ timecore.scm psxtime.scm cltime.scm timezone.scm tzfile.scm
bfiles = fluidlet.scm object.scm recobj.scm yasyn.scm collect.scm collectx.scm
scfiles = r4rsyn.scm scmacro.scm synclo.scm synrul.scm synchk.scm \
repl.scm macwork.scm mwexpand.scm mwdenote.scm mwsynrul.scm
@@ -125,7 +103,8 @@ efiles = record.scm dynamic.scm process.scm hash.scm \
rfiles = rdms.scm alistab.scm paramlst.scm \
batch.scm crc.scm dbrowse.scm getopt.scm dbinterp.scm \
dbcom.scm dbsyn.scm
-gfiles = colorspc.scm cie1931.xyz cie1964.xyz resenecolours.txt saturate.txt
+gfiles = colorspc.scm cie1931.xyz cie1964.xyz resenecolours.txt saturate.txt \
+ nbs-iscc.txt ciesid65.dat ciesia.dat
txiscms =grapheps.scm glob.scm getparam.scm \
vet.scm top-refs.scm hashtab.scm chap.scm comparse.scm\
@@ -136,7 +115,8 @@ txiscms =grapheps.scm glob.scm getparam.scm \
minimize.scm factor.scm determ.scm daylight.scm colornam.scm\
mkclrnam.scm color.scm subarray.scm dbutil.scm array.scm transact.scm\
arraymap.scm phil-spc.scm lineio.scm differ.scm cvs.scm tree.scm\
- coerce.scm byte.scm bytenumb.scm matfile.scm tsort.scm manifest.scm
+ coerce.scm byte.scm bytenumb.scm matfile.scm tsort.scm manifest.scm\
+ peanosfc.scm
txifiles =grapheps.txi glob.txi getparam.txi\
vet.txi top-refs.txi hashtab.txi chap.txi comparse.txi\
alist.txi ratize.txi modular.txi dirs.txi priorque.txi queue.txi\
@@ -146,47 +126,94 @@ txifiles =grapheps.txi glob.txi getparam.txi\
minimize.txi factor.txi determ.txi daylight.txi colornam.txi\
mkclrnam.txi color.txi subarray.txi dbutil.txi array.txi transact.txi\
arraymap.txi phil-spc.txi lineio.txi differ.txi cvs.txi tree.txi\
- coerce.txi byte.txi bytenumb.txi matfile.txi tsort.txi manifest.txi
+ coerce.txi byte.txi bytenumb.txi matfile.txi tsort.txi manifest.txi\
+ peanosfc.txi
% = `echo $(txiscms) | sed 's%.scm%.txi%g'`
-docfiles = ANNOUNCE README COPYING FAQ slib.info slib.texi schmooz.texi\
- ChangeLog version.txi object.texi $(txifiles)
+texifiles = schmooz.texi indexes.texi object.texi format.texi
+docfiles = ANNOUNCE README COPYING FAQ slib.1 slib.info slib.texi version.txi\
+ ChangeLog $(texifiles) $(txifiles)
mkfiles = Makefile require.scm Template.scm syncase.sh mklibcat.scm \
Bev2slib.scm slib.spec slib.sh grapheps.ps
ifiles = bigloo.init chez.init elk.init macscheme.init mitscheme.init \
- scheme2c.init scheme48.init s48-0_57.init gambit.init t3.init \
+ scheme2c.init scheme48.init gambit.init t3.init \
vscm.init scm.init scsh.init pscheme.init STk.init \
- RScheme.init DrScheme.init umbscheme.init guile.init
-tfiles = plottest.scm macrotst.scm dwindtst.scm
+ RScheme.init DrScheme.init umbscheme.init guile.init jscheme.init
+tfiles = plottest.scm macrotst.scm dwindtst.scm formatst.scm
sfiles = $(ffiles) $(lfiles) $(revfiles) $(afiles) $(scfiles) $(efiles) \
$(rfiles) $(gfiles) $(scafiles) $(txiscms) $(srfiles)
-allfiles = $(docfiles) $(mkfiles) $(ifiles) $(sfiles) $(tfiles) $(bfiles)
+allfiles = $(docfiles) $(mkfiles) $(ifiles) $(sfiles) $(tfiles) $(bfiles) \
+ slib.doc clrnamdb.scm
+
+pinstall: slib.1
+ test -d $(mandir) || mkdir $(mandir)
+ test -d $(man1dir) || mkdir $(man1dir)
+ -cp slib.1 $(man1dir)
+
+install: pinstall clrnamdb.scm
+ test -d $(libdir) || mkdir $(libdir)
+ test -d $(libslibdir) || mkdir $(libslibdir)
+ -cp $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm $(libslibdir)
+ test -d $(bindir) || mkdir $(bindir)
+ echo '#! /bin/sh' > $(bindir)slib
+ echo SCHEME_LIBRARY_PATH=$(libslibdir) >> $(bindir)slib
+ echo export SCHEME_LIBRARY_PATH >> $(bindir)slib
+ echo VERSION=$(VERSION) >> $(bindir)slib
+ echo "S48_VICINITY=\"$(LIB)\";export S48_VICINITY" >> $(bindir)slib
+ cat slib.sh >> $(bindir)slib
+ chmod +x $(bindir)slib
+
+uninstall:
+ -(cd $(libslibdir); rm $(ifiles) $(sfiles) $(bfiles) $(mkfiles) clrnamdb.scm)
+ -rm $(bindir)slib
+ -rm $(man1dir)slib.1
+
+slib.doc: slib.1
+ nroff -man $< | ul -tunknown >$@
+
+#### Stuff for maintaining SLIB below ####
+
+ver = $(VERSION)
+version.txi: Makefile
+ echo @set SLIBVERSION $(ver) > version.txi
+ echo @set SLIBDATE `date +"%B %Y"` >> version.txi
+
+scheme = scm
+
+collect.sc:
+ echo "(require 'macros-that-work)" > collect.sc
+ echo "(require 'pprint-file)" >> collect.sc
+ echo "(require 'yasos)" >> collect.sc
+ echo "(pprint-filter-file \"collect.scm\" macwork:expand \"collectx.scm\")" >> collect.sc
+ echo "(slib:exit #t)" >> collect.sc
+
+collectx.scm: collect.scm macwork.scm collect.sc
+ $(scheme) < collect.sc
$(txifiles): $(txiscms) schmooz.scm
$(scheme) -rschmooz -e'(schmooz "slib.texi")'
dvi: $(dvidir)slib.dvi
-$(dvidir)slib.dvi: version.txi slib.texi $(dvidir)slib.fn \
- $(txifiles) object.texi schmooz.texi
-# cd $(dvidir);export TEXINPUTS=$(srcdir):;texi2dvi $(srcdir)slib.texi
- -(cd $(dvidir);export TEXINPUTS=$(srcdir):;texindex slib.??)
- cd $(dvidir);export TEXINPUTS=$(srcdir):;tex $(srcdir)slib.texi
+$(dvidir)slib.dvi: version.txi slib.texi $(dvidir)slib.fn $(txifiles) $(texifiles)
+# cd $(dvidir);TEXINPUTS=$(srcdir):;export TEXINPUTS;texi2dvi $(srcdir)slib.texi
+ -(cd $(dvidir);TEXINPUTS=$(srcdir):;export TEXINPUTS;texindex slib.??)
+ cd $(dvidir);TEXINPUTS=$(srcdir):;export TEXINPUTS;tex $(srcdir)slib.texi
$(dvidir)slib.fn:
- cd $(dvidir);export TEXINPUTS=$(srcdir):;tex $(srcdir)slib.texi \
+ cd $(dvidir);TEXINPUTS=$(srcdir):;export TEXINPUTS;tex $(srcdir)slib.texi \
$(srcdir)schmooz.texi
xdvi: $(dvidir)slib.dvi
xdvi -s 3 $(dvidir)slib.dvi
pdf: $(htmldir)slib.pdf
-$(htmldir)slib.pdf: version.txi slib.texi $(dvidir)slib.fn schmooz.texi
+$(htmldir)slib.pdf: version.txi slib.texi $(dvidir)slib.fn $(txifiles) $(texifiles)
# cd $(dvidir);dvipdf slib.dvi # doesn't have links!
- cd $(dvidir);export TEXINPUTS=$(srcdir):;pdftex $(srcdir)slib.texi
+ cd $(dvidir);TEXINPUTS=$(srcdir):;export TEXINPUTS;pdftex $(srcdir)slib.texi
mv $(dvidir)slib.pdf $(htmldir)
xpdf: $(htmldir)slib.pdf
xpdf -z 3 $(htmldir)slib.pdf
TEXI2HTML = /usr/local/bin/texi2html -split -verbose
-slib_toc.html: $(txifiles) version.txi slib.texi schmooz.texi
+slib_toc.html: version.txi slib.texi $(txifiles) $(texifiles)
${TEXI2HTML} slib.texi
html: $(htmldir)slib_toc.html
$(htmldir)slib_toc.html: slib_toc.html Makefile
@@ -195,7 +222,7 @@ $(htmldir)slib_toc.html: slib_toc.html Makefile
then hitch $(PREVDOCS)slib_\*.html slib_\*.html $(htmldir); \
else cp slib_*.html $(htmldir);fi
-slib$(VERSION).info: $(txifiles) version.txi slib.texi schmooz.texi
+slib$(VERSION).info: version.txi slib.texi $(txifiles) $(texifiles)
makeinfo slib.texi --no-warn --no-split -o slib.info
mv slib.info slib$(VERSION).info
slib.info: slib$(VERSION).info
@@ -205,7 +232,7 @@ slib.info: slib$(VERSION).info
info: installinfo
installinfo: $(infodir)slib.info
$(infodir)slib.info: slib.info
- cp -a slib.info $(infodir)slib.info
+ cp -p slib.info $(infodir)slib.info
-install-info $(infodir)slib.info $(infodir)dir
-rm $(infodir)slib.info.gz
infoz: installinfoz
@@ -215,9 +242,11 @@ $(infodir)slib.info.gz: $(infodir)slib.info
makedev = make -f $(HOME)/makefile.dev
CHPAT=$(HOME)/bin/chpat
-RSYNC=rsync -avessh
+RSYNC=rsync --rsync-path=bin/rsync -bav
UPLOADEE=swissnet_upload
dest = $(HOME)/dist/
+DOSCM = /misc/usb1/scm/
+
temp/slib: $(allfiles)
-rm -rf temp
mkdir temp
@@ -230,6 +259,7 @@ infotemp/slib: slib.info
mkdir infotemp/slib
ln slib.info slib.info-* infotemp/slib
#For change-barred HTML.
+prevdocs: $(PREVDOCS)slib_toc.html $(PREVDOCS)slib.info
$(PREVDOCS)slib_toc.html:
$(PREVDOCS)slib.info: srcdir.mk Makefile
cd $(PREVDOCS); unzip -ao $(dest)slib*.zip
@@ -282,7 +312,7 @@ $(dest)slib$(VERSION).tar.gz: temp/slib
rpm: pubzip
#$(dest)slib-$(VERSION)-$(RELEASE).noarch.rpm: $(dest)slib$(VERSION).zip
cp $(HOME)/pub/slib.zip $(rpm_prefix)SOURCES/slib$(VERSION).zip
- rpm -ba slib.spec # --clean
+ rpmbuild -ba slib.spec # --clean
rm $(rpm_prefix)SOURCES/slib$(VERSION).zip
mv $(rpm_prefix)RPMS/noarch/slib-$(VERSION)-$(RELEASE).noarch.rpm \
$(rpm_prefix)SRPMS/slib-$(VERSION)-$(RELEASE).src.rpm $(dest)
@@ -297,10 +327,10 @@ slib.com: temp/slib
zip: slib.zip
slib.zip: temp/slib
$(makedev) DEST=../ PROD=slib zip
-doszip: /c/scm/dist/slib$(VERSION).zip
-/c/scm/dist/slib$(VERSION).zip: temp/slib
- $(makedev) DEST=/c/scm/dist/ PROD=slib ver=$(VERSION) zip
- zip -d /c/scm/dist/slib$(VERSION).zip slib/slib.info
+doszip: $(DOSCM)dist/slib$(VERSION).zip
+$(DOSCM)dist/slib$(VERSION).zip: temp/slib
+ $(makedev) DEST=$(DOSCM)dist/ PROD=slib ver=$(VERSION) zip
+ zip -d $(DOSCM)dist/slib$(VERSION).zip slib/slib.info
pubzip: temp/slib
$(makedev) DEST=$(HOME)/pub/ PROD=slib zip
@@ -343,8 +373,8 @@ new:
$(htmldir)JACAL.html \
$(htmldir)SCM.html \
$(htmldir)SIMSYNCH.html ../scm/scm.texi \
- /c/scm/dist/install.bat /c/scm/dist/makefile \
- /c/scm/dist/mkdisk.bat
+ $(DOSCM)dist/install.bat $(DOSCM)dist/makefile \
+ $(DOSCM)dist/mkdisk.bat
$(CHPAT) slib-$(VERSION) slib-$(ver) ANNOUNCE FAQ ../scm/ANNOUNCE \
../jacal/ANNOUNCE ../wb/README ../wb/ANNOUNCE \
../synch/ANNOUNCE \
@@ -352,14 +382,14 @@ new:
$(htmldir)JACAL.html \
$(htmldir)SCM.html \
$(htmldir)SIMSYNCH.html ../scm/scm.texi \
- /c/scm/dist/install.bat /c/scm/dist/makefile \
- /c/scm/dist/mkdisk.bat
+ $(DOSCM)dist/install.bat $(DOSCM)dist/makefile \
+ $(DOSCM)dist/mkdisk.bat
$(CHPAT) $(VERSION) $(ver) README slib.texi require.scm Makefile \
- $(htmldir)SLIB.html slib.spec scheme48.init s48-0_57.init
+ $(htmldir)SLIB.html slib.spec scheme48.init
cvs commit -lm '(*SLIB-VERSION*): Bumped from $(VERSION) to $(ver).'
cvs tag -lF slib$(ver)
-tagfiles = README version.txi slib.texi \
+tagfiles = README version.txi slib.texi $(texifiles) \
$(mkfiles) $(sfiles) $(bfiles) $(tfiles) $(ifiles)
# README and $(ifiles) cause semgentation faults in ETAGS for Emacs version 19.
tags: $(tagfiles)