Update of /cvsroot/scsh/scsh-0.6
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9857
Modified Files:
Makefile.in
Log Message:
Various changes...
Index: Makefile.in
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.in 1999/11/16 16:37:28 1.12
--- Makefile.in 2000/10/19 08:24:39 1.13
***************
*** 84,89 ****
# JMG now according 2
! LINKER_VM = /home/ai/marting/lib/scheme48/scheme48vm $(BIG_HEAP)
! LINKER_RUNNABLE = s4853
LINKER_IMAGE = build/linker.image
--- 84,89 ----
# JMG now according 2
! LINKER_VM =
/afs/informatik.uni-tuebingen.de/home/gasbichl/i386_fbsd40/lib/scheme48/scheme48vm
$(BIG_HEAP)
! LINKER_RUNNABLE = scheme48
LINKER_IMAGE = build/linker.image
***************
*** 104,116 ****
CIGOBJS = cig/libcig.o cig/libcig1.o
! #JMG: the 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/dirstuff1.o \
scsh/fdports1.o \
--- 104,115 ----
CIGOBJS = cig/libcig.o cig/libcig1.o
! #scsh-lib
LIBSCSH = scsh/lib$(VM).a
SCSHVMHACKS = scsh/proc2.o
#
#
SCSHOBJS = \
+ scsh/cstuff.o \
scsh/dirstuff1.o \
scsh/fdports1.o \
***************
*** 122,126 ****
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 \
--- 121,124 ----
***************
*** 135,139 ****
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)
--- 133,137 ----
UNIX_OBJS = c/unix/misc.o c/unix/io.o c/unix/fd-io.o c/unix/event.o
!
S48OBJS = c/scheme48vm.o c/scheme48heap.o c/extension.o c/external.o
OBJS = scsh/process_args.o $(S48OBJS) $(CIGOBJS) $(SCSHOBJS) $(SCSHVMHACKS)
***************
*** 159,164 ****
# After changing any of these you should delete `scheme48vm' and remake it.
! CIGGED = flock network select syscalls tty time sighandlers re_low rdelim
! #re
CIGGEDOBJ = $(patsubst %,scsh/%.o, $(CIGGED))
CIGGEDINIT = $(patsubst %,s48_init_%, $(CIGGED))
--- 157,161 ----
# After changing any of these you should delete `scheme48vm' and remake it.
! CIGGED = flock network select syscalls tty time sighandlers re_low
CIGGEDOBJ = $(patsubst %,scsh/%.o, $(CIGGED))
CIGGEDINIT = $(patsubst %,s48_init_%, $(CIGGED))
***************
*** 199,204 ****
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
--- 196,201 ----
installation. \
| mail scheme-48-notifications@martigny.ai.mit.edu
+
# This says how to process .scm files with cig to make .c stubs.
.SUFFIXES: .scm
***************
*** 210,214 ****
scsh/dirstuff1.o: scsh/dirstuff1.h
- scsh/rdelim.o: scsh/fdports1.h
scsh/userinfo1.o: scsh/userinfo1.h
--- 207,210 ----
***************
*** 353,357 ****
echo >>$@ && \
echo "lib=`pwd`" >>$@ && \
! echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/$(IMAGE) "$$@"' \
>>$@ && \
chmod +x $@
--- 349,353 ----
echo >>$@ && \
echo "lib=`pwd`" >>$@ && \
! echo 'exec $$lib/$(VM) -o $$lib/$(VM) -i $$lib/scsh/$(IMAGE) "$$@"'
\
>>$@ && \
chmod +x $@
***************
*** 378,384 ****
autoheader && autoconf
clean: clean-cig clean-scsh
-rm -f $(VM) *.o c/unix/*.o c/*.o c/fake/*.o \
! TAGS $(IMAGE) \
build/*.tmp $(MANPAGE) build/linker.image \
scheme/debug/*.image scheme/debug/*.debug \
--- 374,381 ----
autoheader && autoconf
+ #JMG: removed TAGS
clean: clean-cig clean-scsh
-rm -f $(VM) *.o c/unix/*.o c/*.o c/fake/*.o \
! $(IMAGE) \
build/*.tmp $(MANPAGE) build/linker.image \
scheme/debug/*.image scheme/debug/*.debug \
***************
*** 390,394 ****
clean-scm2c:
! rm -f scsh/flock.c scsh/network.c scsh/rdelim.c \
scsh/select.c scsh/syscalls.c scsh/tty.c scsh/time.c \
scsh/sighandlers.c scsh/rx/re-low.c
--- 387,391 ----
clean-scm2c:
! 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
***************
*** 397,401 ****
#JMG: moved config.cache to distclean for easier debugging
distclean: clean
! rm -f Makefile config.log config.status c/sysdep.h config.cache
check: $(VM) $(IMAGE) scheme/debug/check.scm
--- 394,403 ----
#JMG: moved config.cache to distclean for easier debugging
distclean: clean
! 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
***************
*** 421,428 ****
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
# --------------------
--- 423,431 ----
tags:
! 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
# --------------------
***************
*** 729,732 ****
--- 732,736 ----
scsh/fr.scm \
scsh/glob.scm \
+ scsh/dot-locking.scm \
scsh/here.scm \
scsh/machine/bufpol.scm \
***************
*** 774,778 ****
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
--- 778,781 ----
|