Update of /cvsroot/scsh/scsh-0.6
In directory usw-pr-cvs1:/tmp/cvs-serv28446
Modified Files:
Makefile.in configure.in
Log Message:
Use Scheme 48 regexp code instead of ours.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** Makefile.in 2001/08/08 12:52:37 1.27
--- Makefile.in 2001/08/09 13:53:17 1.28
***************
*** 125,129 ****
scsh/network1.o \
scsh/putenv.o \
! scsh/rx/re1.o \
scsh/select.o scsh/select1.o \
scsh/sleep1.o \
--- 125,129 ----
scsh/network1.o \
scsh/putenv.o \
! scsh/rx/regexp1.o \
scsh/select.o scsh/select1.o \
scsh/sleep1.o \
***************
*** 133,141 ****
scsh/tty.o scsh/tty1.o \
scsh/userinfo1.o \
! scsh/sighandlers1.o \
! scsh/regexp/libregex.a
! SCSH_INITIALIZERS = s48_init_syslog s48_init_userinfo s48_init_sighandlers \
! s48_init_re_low s48_init_syscalls2 s48_init_network s48_init_flock
UNIX_OBJS = c/unix/misc.o c/unix/io.o c/unix/fd-io.o c/unix/event.o
--- 133,141 ----
scsh/tty.o scsh/tty1.o \
scsh/userinfo1.o \
! scsh/sighandlers1.o
! SCSH_INITIALIZERS = s48_init_syslog s48_init_posix_regexp \
! s48_init_userinfo s48_init_sighandlers \
! s48_init_syscalls2 s48_init_network s48_init_flock
UNIX_OBJS = c/unix/misc.o c/unix/io.o c/unix/fd-io.o c/unix/event.o
***************
*** 234,241 ****
scsh/tty1.o scsh/tty.o: scsh/tty1.h
! # Not really, but making regexp/libregex.a makes the regexp/regex.h file that
! # re1.c actually does need.
! # TODO: This is broken at the moment: regex.h is not made after checkout
! scsh/rx/re1.o: scsh/rx/re1.h scsh/regexp/libregex.a
scsh/syscalls.o: scsh/syscalls1.h scsh/dirstuff1.h scsh/fdports1.h \
--- 234,238 ----
scsh/tty1.o scsh/tty.o: scsh/tty1.h
! scsh/rx/regexp1.o: c/scheme48.h
scsh/syscalls.o: scsh/syscalls1.h scsh/dirstuff1.h scsh/fdports1.h \
***************
*** 425,429 ****
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
--- 422,426 ----
distclean: clean
rm -f Makefile config.log config.status c/sysdep.h config.cache \
! scsh/machine \
scsh/endian.scm scsh/static.scm \
exportlist.aix
***************
*** 760,763 ****
--- 757,762 ----
scsh/rdelim.scm \
scsh/rw.scm \
+ scsh/rx/packages.scm \
+ scsh/rx/cond-package.scm \
scsh/scsh-condition.scm \
scsh/scsh-interfaces.scm \
***************
*** 838,844 ****
| ./$(VM) -o ./$(VM) -i $(CIG).image -h 10000000
- scsh/regexp/libregex.a:
- cd ./scsh/regexp; $(MAKE) lib
-
install-scsh: scsh install-scsh-image
$(RM) $(bindir)/$(RUNNABLE)
--- 837,840 ----
***************
*** 859,866 ****
clean-scsh:
! $(RM) scsh/*.o scsh/regexp/*.o scsh/rx/*.o scsh/machine/*.o
$(RM) scsh/*.image
$(RM) $(LIBSCSHVM) $(LIBSCSH) scsh/scsh$(EXEEXT)
- -cd scsh/regexp; $(MAKE) clean
--- 855,861 ----
clean-scsh:
! $(RM) scsh/*.o scsh/rx/*.o scsh/machine/*.o
$(RM) scsh/*.image
$(RM) $(LIBSCSHVM) $(LIBSCSH) scsh/scsh$(EXEEXT)
Index: configure.in
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** configure.in 2001/06/21 09:23:18 1.14
--- configure.in 2001/08/09 13:53:17 1.15
***************
*** 397,401 ****
! AC_OUTPUT(Makefile scsh/regexp/Makefile scsh/endian.scm scsh/static.scm)
chmod +x scsh/static.scm
--- 397,401 ----
! AC_OUTPUT(Makefile scsh/endian.scm scsh/static.scm)
chmod +x scsh/static.scm
|