Various changes...
This commit is contained in:
mainzelm
parent
a5dd906406
commit
510ab69315
43
Makefile.in
43
Makefile.in
|
|
@ -83,8 +83,8 @@ BIG_HEAP = -h 5000000
|
|||
# LINKER_RUNNABLE = $(LINKER_VM) -i $(IMAGE)
|
||||
|
||||
# JMG now according 2
|
||||
LINKER_VM = /home/ai/marting/lib/scheme48/scheme48vm $(BIG_HEAP)
|
||||
LINKER_RUNNABLE = s4853
|
||||
LINKER_VM = /afs/informatik.uni-tuebingen.de/home/gasbichl/i386_fbsd40/lib/scheme48/scheme48vm $(BIG_HEAP)
|
||||
LINKER_RUNNABLE = scheme48
|
||||
|
||||
LINKER_IMAGE = build/linker.image
|
||||
LINKER = $(LINKER_VM) -i $(LINKER_IMAGE)
|
||||
|
|
@ -103,15 +103,14 @@ LIBCIG = cig/lib$(VM).a
|
|||
CIG = cig/cig
|
||||
CIGOBJS = cig/libcig.o cig/libcig1.o
|
||||
|
||||
#JMG: the scsh-lib
|
||||
#scsh-lib
|
||||
LIBSCSH = scsh/lib$(VM).a
|
||||
SCSHVMHACKS = scsh/proc2.o
|
||||
|
||||
#JMG: and it's object files
|
||||
#JMG left out: scsh/re.o scsh/re1.o scsh/regexp/regexp.o scsh/regexp/regsub.o
|
||||
#
|
||||
#
|
||||
SCSHOBJS = \
|
||||
scsh/cstuff.o \
|
||||
scsh/dirstuff1.o \
|
||||
scsh/fdports1.o \
|
||||
scsh/flock.o scsh/flock1.o \
|
||||
|
|
@ -121,7 +120,6 @@ SCSHOBJS = \
|
|||
scsh/machine/libansi.o \
|
||||
scsh/network.o scsh/network1.o \
|
||||
scsh/putenv.o \
|
||||
scsh/rdelim.o \
|
||||
scsh/rx/re-low.o scsh/rx/re1.o \
|
||||
scsh/select.o scsh/select1.o \
|
||||
scsh/sleep1.o \
|
||||
|
|
@ -134,7 +132,7 @@ SCSHOBJS = \
|
|||
|
||||
UNIX_OBJS = c/unix/misc.o c/unix/io.o c/unix/fd-io.o c/unix/event.o
|
||||
|
||||
#JMG: I omit process_args.o and SCSHVMHACKS no longer
|
||||
|
||||
S48OBJS = c/scheme48vm.o c/scheme48heap.o c/extension.o c/external.o
|
||||
OBJS = scsh/process_args.o $(S48OBJS) $(CIGOBJS) $(SCSHOBJS) $(SCSHVMHACKS)
|
||||
|
||||
|
|
@ -158,8 +156,7 @@ enough: $(VM) $(IMAGE) go $(LIBCIG) scsh $(LIBSCSH)
|
|||
# External code to include in the VM
|
||||
# After changing any of these you should delete `scheme48vm' and remake it.
|
||||
|
||||
CIGGED = flock network select syscalls tty time sighandlers re_low rdelim
|
||||
#re
|
||||
CIGGED = flock network select syscalls tty time sighandlers re_low
|
||||
CIGGEDOBJ = $(patsubst %,scsh/%.o, $(CIGGED))
|
||||
CIGGEDINIT = $(patsubst %,s48_init_%, $(CIGGED))
|
||||
|
||||
|
|
@ -199,7 +196,7 @@ LOOKUP_INITIALIZERS = s48_init_external_lookup
|
|||
installation. \
|
||||
| mail scheme-48-notifications@martigny.ai.mit.edu
|
||||
|
||||
JMG: scsh stuff
|
||||
|
||||
# This says how to process .scm files with cig to make .c stubs.
|
||||
.SUFFIXES: .scm
|
||||
.scm.c:
|
||||
|
|
@ -209,7 +206,6 @@ JMG: scsh stuff
|
|||
# and imported into foo.scm's stub foo.c.
|
||||
|
||||
scsh/dirstuff1.o: scsh/dirstuff1.h
|
||||
scsh/rdelim.o: scsh/fdports1.h
|
||||
scsh/userinfo1.o: scsh/userinfo1.h
|
||||
|
||||
scsh/fdports1.o scsh/fdports.o: scsh/fdports1.h
|
||||
|
|
@ -352,7 +348,7 @@ go:
|
|||
echo '#!/bin/sh' >$@ && \
|
||||
echo >>$@ && \
|
||||
echo "lib=`pwd`" >>$@ && \
|
||||
echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/$(IMAGE) "$$@"' \
|
||||
echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/scsh/$(IMAGE) "$$@"' \
|
||||
>>$@ && \
|
||||
chmod +x $@
|
||||
|
||||
|
|
@ -377,9 +373,10 @@ dirs:
|
|||
configure: configure.in
|
||||
autoheader && autoconf
|
||||
|
||||
#JMG: removed TAGS
|
||||
clean: clean-cig clean-scsh
|
||||
-rm -f $(VM) *.o c/unix/*.o c/*.o c/fake/*.o \
|
||||
TAGS $(IMAGE) \
|
||||
$(IMAGE) \
|
||||
build/*.tmp $(MANPAGE) build/linker.image \
|
||||
scheme/debug/*.image scheme/debug/*.debug \
|
||||
scheme/vm/scheme48vm.c scheme/vm/scheme48heap.c \
|
||||
|
|
@ -389,14 +386,19 @@ clean-cig:
|
|||
-rm -f cig/*.o $(CIG) $(CIG).image $(LIBCIG)
|
||||
|
||||
clean-scm2c:
|
||||
rm -f scsh/flock.c scsh/network.c scsh/rdelim.c \
|
||||
rm -f scsh/flock.c scsh/network.c \
|
||||
scsh/select.c scsh/syscalls.c scsh/tty.c scsh/time.c \
|
||||
scsh/sighandlers.c scsh/rx/re-low.c
|
||||
|
||||
|
||||
#JMG: moved config.cache to distclean for easier debugging
|
||||
distclean: clean
|
||||
rm -f Makefile config.log config.status c/sysdep.h config.cache
|
||||
rm -f Makefile config.log config.status c/sysdep.h config.cache \
|
||||
scsh/machine scsh/regexp/Makefile \
|
||||
scsh/endian.scm scsh/static.scm \
|
||||
exportlist.aix
|
||||
$(RM) a.exe $(VM).base $(VM).def $(VM).exp
|
||||
-find . -name '*~' -o -name '#*' -o -name core -exec rm {} \;
|
||||
|
||||
check: $(VM) $(IMAGE) scheme/debug/check.scm
|
||||
( \
|
||||
|
|
@ -420,10 +422,11 @@ image: $(INITIAL)
|
|||
$(MAKE) $(IMAGE)
|
||||
|
||||
tags:
|
||||
etags scsh/*.scm scsh/*.c \
|
||||
scheme/vm/arch.scm scheme/rts/*.scm scheme/bcomp/*.scm \
|
||||
scheme/*.scm scheme/env/*.scm scheme/big/*.scm scheme/link/*.scm \
|
||||
scheme/opt/*.scm scheme/debug/*.scm scheme/misc/*.scm
|
||||
find . -name "*.scm" -or -name "*.c" -or -name "*.h" | etags -
|
||||
# etags scsh/*.scm scsh/*.c \
|
||||
# scheme/vm/arch.scm scheme/rts/*.scm scheme/bcomp/*.scm \
|
||||
# scheme/*.scm scheme/env/*.scm scheme/big/*.scm scheme/link/*.scm \
|
||||
# scheme/opt/*.scm scheme/debug/*.scm scheme/misc/*.scm
|
||||
|
||||
# --------------------
|
||||
# Distribution...
|
||||
|
|
@ -728,6 +731,7 @@ SCHEME =scsh/awk.scm \
|
|||
scsh/fname.scm \
|
||||
scsh/fr.scm \
|
||||
scsh/glob.scm \
|
||||
scsh/dot-locking.scm \
|
||||
scsh/here.scm \
|
||||
scsh/machine/bufpol.scm \
|
||||
scsh/machine/errno.scm \
|
||||
|
|
@ -773,7 +777,6 @@ cig/libcig.c: cig/libcig.scm
|
|||
scsh/flock.c: scsh/flock.scm
|
||||
scsh/jcontrol2.c: scsh/jcontrol2.scm
|
||||
scsh/network.c: scsh/network.scm
|
||||
scsh/rdelim.c: scsh/rdelim.scm
|
||||
scsh/select.c: scsh/select.scm
|
||||
scsh/syscalls.c: scsh/syscalls.scm
|
||||
scsh/tty.c: scsh/tty.scm
|
||||
|
|
|
|||
Loading…
Reference in New Issue