diff -ruN klic-3.003-2002-03-05g/Configure klic-3.003-2002-03-08/Configure --- klic-3.003-2002-03-05g/Configure Mon Mar 4 12:32:50 2002 +++ klic-3.003-2002-03-08/Configure Fri Mar 8 14:27:38 2002 @@ -1348,7 +1348,6 @@ cat <>runtime/Makefile DISTCFLAGS = \$(CFLAGS) -DDIST -I../include -EXT_OTHER_HEADERS = DIST_OTHER_SRCS = DIST_OTHER_OBJS = @@ -1366,14 +1365,11 @@ echo "# Writing out include/Makefile" if $DISTSYSTEM ; then -. runtime/config/$disttype/include.mk.sh > include/Makefile cat >include/Makefile || give_up_config "Can't create include/makefile properly" echo ' ' else cat <include/Makefile - -DIST_OTHER_HEADERS = GAZONK diff -ruN klic-3.003-2002-03-05g/MANIFEST klic-3.003-2002-03-08/MANIFEST --- klic-3.003-2002-03-05g/MANIFEST Fri Feb 8 13:41:46 2002 +++ klic-3.003-2002-03-08/MANIFEST Fri Mar 8 14:27:56 2002 @@ -235,7 +235,6 @@ ./runtime/config/pvm/distproc.c ./runtime/config/pvm/distproc.h ./runtime/config/pvm/distrmon.c -./runtime/config/pvm/include.mk.sh ./runtime/config/pvm/rmon_server.c ./runtime/config/pvm/root.mk.sh ./runtime/config/pvm/runtime.mk.sh @@ -261,7 +260,6 @@ ./runtime/config/shm/distproc.c ./runtime/config/shm/distproc.h ./runtime/config/shm/distrmon.c -./runtime/config/shm/include.mk.sh ./runtime/config/shm/rmon_server.c ./runtime/config/shm/root.mk.sh ./runtime/config/shm/runtime.mk.sh diff -ruN klic-3.003-2002-03-05g/runtime/Makefile.head klic-3.003-2002-03-08/runtime/Makefile.head --- klic-3.003-2002-03-05g/runtime/Makefile.head Thu Dec 27 19:15:57 2001 +++ klic-3.003-2002-03-08/runtime/Makefile.head Fri Mar 8 13:41:04 2002 @@ -14,6 +14,5 @@ KLICDB= klic.db TARGETS = $(KLICDB) $(ARCHIVES) $(DLLIBS) pipedio $(EXTENSION) COMPILEINC = ../include/klic -EXTCOMPILEINC = ../include/klic EXTENSION = INSTALL_EXTENSTION = diff -ruN klic-3.003-2002-03-05g/runtime/Makefile.tail klic-3.003-2002-03-08/runtime/Makefile.tail --- klic-3.003-2002-03-05g/runtime/Makefile.tail Mon Mar 4 12:32:50 2002 +++ klic-3.003-2002-03-08/runtime/Makefile.tail Fri Mar 8 15:35:46 2002 @@ -33,24 +33,12 @@ $(COMPILEINC)/g_vector.h $(COMPILEINC)/g_float.h \ $(COMPILEINC)/g_termarray.h -EXTHEADERS = \ - $(EXTCOMPILEINC)/traceio.h \ - $(EXTCOMPILEINC)/interpe.h \ - $(EXTCOMPILEINC)/rmon.h \ - $(EXTCOMPILEINC)/sighndl.h \ - $(EXTCOMPILEINC)/distio.h \ - $(EXTCOMPILEINC)/distpkt.h \ - $(EXTCOMPILEINC)/distproc.h \ - $(EXT_OTHER_HEADES) - -SHMHEDAERS = $(COMPILEINC)/shm.h $(COMPILEINC)/shm_machine.h - -NODSRCS = alloc.c gc.c unify2.c version.c \ +NODSRCS = alloc.c unify2.c version.c \ cmphsh.c wakeup.c signal.c asyncio.c \ - faisus.c intrpt.c print.c unify.c bb.c \ + faisus.c print.c unify.c bb.c \ generic.c trace.c step.c otbl.c recsusp.c main.c \ options.c timer.c ktimer.c xio.c \ - $(NODNODEBUGSRCS) $(GENERIC_SRCS) + kmain.c sched.c $(GENERIC_SRCS) SRCS = $(NODSRCS) $(KL1CSRCS) $(KL1NODCSRCS) $(DISTSRCS) @@ -60,6 +48,12 @@ parse.kl1 scan.kl1 read.kl1 var.kl1 termio.kl1 unparse.kl1 \ stack.kl1 queue.kl1 bag.kl1 bags.kl1 bagk.kl1 bagks.kl1 \ setk.kl1 setks.kl1 splay.kl1 compare.kl1 itimer.kl1 +COMMONKL1EXTS = \ + atomt.ext functt.ext gcmerge.ext gen.ext \ + iarith.ext farith.ext uterms.ext sysc.ext \ + parse.ext scan.ext read.ext var.ext termio.ext unparse.ext \ + stack.ext queue.ext bag.ext bags.ext bagk.ext bagks.ext \ + setk.ext setks.ext splay.ext compare.ext itimer.ext COMMONKL1CSRCS = \ atomt.c functt.c gcmerge.c gen.c \ iarith.c farith.c uterms.c sysc.c \ @@ -74,83 +68,76 @@ setk.o setks.o splay.o compare.o itimer.o KL1SRCS = bodyblt.kl1 gunix.kl1 io.kl1 +KL1EXTS = bodyblt.ext gunix.ext io.ext KL1NODOBJS = bodyblt.o gunix.o io.o KL1NODCSRCS = bodyblt.c gunix.c io.c KL1DOBJS = bodyblt-d.o gunix-d.o io-d.o KL1DSRCS = bodyblt-d.c gunix-d.c io-d.c KL1SOBJS = bodyblt-s.o gunix-s.o io.o -EXT = \ - atomt.ext functt.ext gcmerge.ext gen.ext \ - iarith.ext farith.ext uterms.ext sysc.ext \ - parse.ext scan.ext read.ext var.ext termio.ext unparse.ext \ - stack.ext queue.ext bag.ext bags.ext bagk.ext bagks.ext \ - setk.ext setks.ext splay.ext compare.ext itimer.ext \ - bodyblt.ext gunix.ext io.ext +EXTS = $(COMMONKL1EXTS) $(KL1EXTS) COMMONOBJS = \ - $(COMMONKL1OBJS) \ + $(COMMONKL1OBJS) $(COMMON_GENERIC_OBJS) \ alloc.o bb.o unify2.o version.o \ - generic.o gtermarray.o gpointer.o random.o \ - gmerge.o cmphsh.o wakeup.o \ - gcode.o gmodule.o ggoal.o \ + generic.o cmphsh.o wakeup.o \ signal.o asyncio.o \ - otbl.o main.o \ + otbl.o main.o faisus.o print.o unify.o \ timer.o ktimer.o xio.o -NODOBJS = gio.o gmvv.o gstring.o gfloat.o \ - newatom.o options.o -DOBJS = gio-d.o gmvv-d.o gstring-d.o gfloat-d.o \ - trace-d.o sched-d.o newatom.o options.o -DSRCS = gio-d.c gmvv-d.c gstring-d.c gfloat-d.c \ - trace-d.c sched-d.c newatom.c options.c -NODEBUGOBJS = gc.o faisus.o print.o unify.o -DEBUGOBJS = gc-t.o faisus-t.o print-t.o unify-t.o recsusp.o -DEBUGSRCS = gc-t.c faisus-t.c print-t.c unify-t.c recsusp.c - -NODNODEBUGOBJS = kmain.o debug.o sched.o intrpt.o -NODNODEBUGSRCS = kmain.c debug.c sched.c intrpt.c -NODDEBUGOBJS = kmain-t.o debug-t.o sched-t.o intrpt-t.o trace.o step.o -NODDEBUGSRCS = kmain-t.c debug-t.c sched-t.c intrpt-t.c trace.c step.c -DDEBUGOBJS = kmain-d.o debug-d.o sched-d.o intrpt-d.o trace-d.o step-d.o -DDEBUGSRCS = kmain-d.c debug-d.c sched-d.c intrpt-d.c trace-d.c step-d.c - -SDEBUGOBJS = kmain-s.o options-s.o debug-s.o newatom-s.o sched-s.o \ - intrpt-s.o gc-s.o trace-s.o faisus-t.o print-t.o unify-t.o \ - recsusp.o gio.o gmvv-s.o gstring-s.o gfloat-s.o step-s.o - -GENERIC_SRCS = \ - gmvv.c gio.c gstring.c gtermarray.c \ - gfloat.c gmerge.c gcode.c gmodule.c ggoal.c gpointer.c \ - random.c - -GENERIC_DSRCS = \ - ge_exref.c ge_readhook.c ge_replyhook.c -GENERIC_DOBJS = \ - ge_exref.o ge_readhook.o ge_replyhook.o +NODOBJS = $(GENERIC_SEQOBJS) newatom.o options.o \ + kmain.o debug.o gc.o sched.o step.o intrpt.o +DOBJS = $(GENERIC_DOBJS) newatom.o options.o \ + kmain-d.o debug-d.o gc.o sched-d.o intrpt-d.o step-d.o trace-d.o +DSRCS = $(GENERIC_DSRCS) newatom.c options.c \ + kmain-d.c debug-d.c gc.c sched-d.c intrpt-d.c step-d.c trace-d.c +DEBUGOBJS = recsusp.o +DEBUGSRCS = recsusp.c + +NODDEBUGOBJS = debug.o gc.o intrpt.o trace.o step.o +NODDEBUGSRCS = debug.c gc.c intrpt.c trace.c step.c +DDEBUGOBJS = debug-d.o gc.o trace-d.o step-d.o +DDEBUGSRCS = debug-d.c gc.c trace-d.c step-d.c + +SDEBUGOBJS = $(DEBUGOBJS) $(GENERIC_SHMOBJS) \ + kmain-s.o options-s.o debug-s.o newatom-s.o sched-s.o \ + intrpt-s.o gc-s.o trace-s.o step-s.o + +COMMON_GENERIC_SRCS = \ + gtermarray.c gmerge.c gcode.c gmodule.c ggoal.c gpointer.c random.c +COMMON_GENERIC_OBJS = \ + gtermarray.o gmerge.o gcode.o gmodule.o ggoal.o gpointer.o random.o + +GENERIC_SEQSRCS = gfloat.c gio.c gmvv.c gstring.c +GENERIC_SEQOBJS = gfloat.o gio.o gmvv.o gstring.o +GENERIC_DSRCS = gfloat-d.c gio-d.c gmvv-d.c gstring-d.c +GENERIC_DOBJS = gfloat-d.o gio-d.o gmvv-d.o gstring-d.o +GENERIC_SHMOBJS = gfloat-s.o gio.o gmvv-s.o gstring-s.o + +GENERIC_SRCS = $(COMMON_GENERIC_SRCS) $(GENERIC_SEQSRCS) + +DIST_GENERIC_SRCS = ge_exref.c ge_readhook.c ge_replyhook.c +DIST_GENERIC_OBJS = ge_exref.o ge_readhook.o ge_replyhook.o DISTSRCS = \ - cntlmsg.c datamsg.c export_table.c ge_exref.c \ - ge_readhook.c ge_replyhook.c import_table.c \ + cntlmsg.c datamsg.c export_table.c import_table.c \ init_dist.c sendrecv.c distrmon.c profile.c \ - $(DIST_OTHER_SRCS) - + $(DIST_OTHER_SRCS) $(DIST_GENERIC_SRCS) DISTOBJS = \ - cntlmsg.o datamsg.o export_table.o ge_exref.o \ - ge_readhook.o ge_replyhook.o import_table.o \ + cntlmsg.o datamsg.o export_table.o import_table.o \ init_dist.o sendrecv.o distrmon.o profile.o \ - $(DIST_OTHER_OBJS) + $(DIST_OTHER_OBJS) $(DIST_GENERIC_OBJS) -GENERIC_SSRCS = gg_shvar.c gg_shbusy.c -GENERIC_SOBJS = gg_shvar.o gg_shbusy.o +SHM_GENERIC_SRCS = gg_shvar.c gg_shbusy.c +SHM_GENERIC_OBJS = gg_shvar.o gg_shbusy.o SHMSRCS = shm_rsv.c shm_throw.c shm_obj.c shm_gc.c SHMOBJS = shm_rsv.o shm_throw.o shm_obj.o shm_gc.o -ALLOBJS = $(COMMONOBJS) $(NODEBUGOBJS) $(DEBUGOBJS) \ +ALLOBJS = $(COMMONOBJS) $(DEBUGOBJS) \ $(KL1NODOBJS) $(KL1DOBJS) $(KL1SOBJS) $(NODOBJS) $(DOBJS) \ - $(NODNODEBUGOBJS) $(NODDEBUGOBJS) $(DDEBUGOBJS) $(SDEBUGOBJS) \ - $(DISTOBJS) $(SHMOBJS) $(GENERIC_SOBJS) + $(NODDEBUGOBJS) $(DDEBUGOBJS) $(SDEBUGOBJS) \ + $(DISTOBJS) $(SHMOBJS) $(SHM_GENERIC_OBJS) uplevel: cd ..;make runtimedir @@ -161,8 +148,7 @@ dist: $(COMMONKL1CSRCS) $(KL1NODCSRCS) \ atom.h funct.h atom.c funct.c predicates.c version.c -libklic.a: $(COMMONOBJS) $(KL1NODOBJS) $(NODEBUGOBJS) \ - $(NODNODEBUGOBJS) $(NODOBJS) +libklic.a: $(COMMONOBJS) $(KL1NODOBJS) $(NODOBJS) ar rcv $@ $? $(RANLIB) $@ @@ -177,12 +163,11 @@ $(RANLIB) $@ libklics.a: $(COMMONOBJS) $(KL1SOBJS) $(SDEBUGOBJS) \ - $(GENERIC_SOBJS) $(SHMOBJS) + $(SHM_GENERIC_OBJS) $(SHMOBJS) ar rcv $@ $? $(RANLIB) $@ -libklic$(DLLEXT): $(COMMONOBJS) $(KL1NODOBJS) $(NODEBUGOBJS) \ - $(NODNODEBUGOBJS) $(NODOBJS) +libklic$(DLLEXT): $(COMMONOBJS) $(KL1NODOBJS) $(NODOBJS) $(LDSHARED) -o $@ $? libklict$(DLLEXT): $(COMMONOBJS) $(KL1NODOBJS) $(DEBUGOBJS) \ @@ -194,43 +179,9 @@ $(LDSHARED) -o $@ $? libklics$(DLLEXT): $(COMMONOBJS) $(KL1SOBJS) $(SDEBUGOBJS) \ - $(GENERIC_SOBJS) $(SHMOBJS) + $(SHM_GENERIC_OBJS) $(SHMOBJS) $(LDSHARED) -o $@ $? -kmain-t.c: kmain.c - rm -f $@; $(LN) $? $@ -debug-t.c: debug.c - rm -f $@; $(LN) $? $@ -gc-t.c: gc.c - rm -f $@; $(LN) $? $@ -faisus-t.c: faisus.c - rm -f $@; $(LN) $? $@ -intrpt-t.c: intrpt.c - rm -f $@; $(LN) $? $@ -print-t.c: print.c - rm -f $@; $(LN) $? $@ -unify-t.c: unify.c - rm -f $@; $(LN) $? $@ -sched-t.c: sched.c - rm -f $@; $(LN) $? $@ - -kmain-t.o: kmain-t.c - $(CC) $(CFLAGS) -I../include -c kmain-t.c -debug-t.o: debug-t.c - $(CC) $(CFLAGS) -I../include -c debug-t.c -gc-t.o: gc-t.c - $(CC) $(CFLAGS) -I../include -c gc-t.c -faisus-t.o: faisus-t.c - $(CC) $(CFLAGS) -I../include -c faisus-t.c -intrpt-t.o: intrpt-t.c - $(CC) $(CFLAGS) -I../include -c intrpt-t.c -print-t.o: print-t.c - $(CC) $(CFLAGS) -I../include -c print-t.c -unify-t.o: unify-t.c - $(CC) $(CFLAGS) -I../include -c unify-t.c -sched-t.o: sched-t.c - $(CC) $(CFLAGS) -I../include -c sched-t.c - kmain-d.c: kmain.c rm -f $@; $(LN) $? $@ debug-d.c: debug.c @@ -377,20 +328,20 @@ >klicdb.atoms klicdb.init: klicdb.atoms klicdb.fncts cat klicdb.atoms klicdb.fncts >klicdb.init -libklic.db: klicdb.refs $(EXT) - ../compiler/klicdb -X. -lklic klicdb.refs $(EXT) -klic.db: klicdb.init libklic.db $(EXT) - ../compiler/klicdb -X. $(EXT) +libklic.db: klicdb.refs $(EXTS) + ../compiler/klicdb -X. -lklic klicdb.refs $(EXTS) +klic.db: klicdb.init libklic.db $(EXTS) + ../compiler/klicdb -X. $(EXTS) atom.h: klic.db - ../compiler/klicdb -X. $(EXT) + ../compiler/klicdb -X. $(EXTS) funct.h: klic.db - ../compiler/klicdb -X. $(EXT) + ../compiler/klicdb -X. $(EXTS) atom.c: klic.db - ../compiler/klicdb -X. $(EXT) + ../compiler/klicdb -X. $(EXTS) funct.c: klic.db - ../compiler/klicdb -X. $(EXT) + ../compiler/klicdb -X. $(EXTS) predicates.c: libklic.db - ../compiler/klicdb -X. $(EXT) + ../compiler/klicdb -X. $(EXTS) version.c: ../version.sed version.c.tmplt sed -f ../version.sed version.c @@ -430,13 +381,13 @@ atom.o funct.o predicates.o \ $(ARCHIVES) $(DLLIBS) pipedio \ rmon_server \ - *-t.c *-d.c \ + *-d.c \ *~ \#*\# (cd config; make clean) distributed-system-clean: /bin/rm -f $(KL1DOBJS) $(DDEBUGOBJS) $(DOBJS) $(DISTOBJS) \ - $(GENERIC_DOBJS) + $(DIST_GENERIC_OBJS) distclean: clean LN="$(LN)" ./setupcomm none @@ -1313,30 +1264,6 @@ ../include/klic/functorstuffs.h \ ../include/klic/susp.h trace.h traceio.h \ ../include/klic/distio.h ../include/klic/distproc.h -kmain-t.o: kmain-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/primitives.h ../include/klic/alloc.h \ - ../include/klic/control.h ../include/klic/unify.h \ - ../include/klic/functorstuffs.h \ - timing.h options.h -debug-t.o: debug-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/primitives.h ../include/klic/alloc.h \ - ../include/klic/control.h ../include/klic/unify.h \ - ../include/klic/index.h ../include/klic/atomstuffs.h \ - ../include/klic/functorstuffs.h -sched-t.o: sched-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/alloc.h trace.h -intrpt-t.o: intrpt-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/sighndl.h ../include/klic/primitives.h \ - ../include/klic/alloc.h ../include/klic/control.h \ - schedule.h trace.o: trace.c \ ../include/klic/basic.h ../include/klic/config.h \ ../include/klic/struct.h ../include/klic/param.h \ @@ -1345,32 +1272,6 @@ ../include/klic/generic.h ../include/klic/g_methtab.h \ ../include/klic/functorstuffs.h \ ../include/klic/susp.h trace.h traceio.h -gc-t.o: gc-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/primitives.h ../include/klic/alloc.h \ - ../include/klic/control.h ../include/klic/functorstuffs.h \ - ../include/klic/g_methtab.h timing.h gobj.h ../include/klic/susp.h -faisus-t.o: faisus-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/alloc.h ../include/klic/control.h \ - ../include/klic/generic.h ../include/klic/g_methtab.h \ - ../include/klic/susp.h gobj.h -print-t.o: print-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/primitives.h ../include/klic/alloc.h \ - ../include/klic/control.h ../include/klic/index.h ../include/klic/gb.h \ - ../include/klic/functorstuffs.h ../include/klic/atomstuffs.h \ - ../include/klic/g_methtab.h \ - gobj.h ../include/klic/susp.h -unify-t.o: unify-t.c \ - ../include/klic/basic.h ../include/klic/config.h \ - ../include/klic/struct.h ../include/klic/param.h \ - ../include/klic/primitives.h ../include/klic/alloc.h \ - ../include/klic/control.h ../include/klic/gb.h \ - ../include/klic/g_methtab.h schedule.h gobj.h ../include/klic/susp.h recsusp.o: recsusp.c \ ../include/klic/basic.h ../include/klic/config.h \ ../include/klic/struct.h ../include/klic/param.h diff -ruN klic-3.003-2002-03-05g/runtime/config/pvm/include.mk.sh klic-3.003-2002-03-08/runtime/config/pvm/include.mk.sh --- klic-3.003-2002-03-05g/runtime/config/pvm/include.mk.sh Thu Dec 27 19:15:57 2001 +++ klic-3.003-2002-03-08/runtime/config/pvm/include.mk.sh Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ -# ---------------------------------------------------------- -# (C) 1995 Institute for New Generation Computer Technology -# (Read COPYRIGHT for detailed information.) -# (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center -# (Read COPYRIGHT-JIPDEC for detailed information.) -# ---------------------------------------------------------- -cat <