diff -ru marlais-0.5.12/Makefile marlais-0.5.12-diff/Makefile --- marlais-0.5.12/Makefile 1995-09-05 04:02:36.000000000 +1000 +++ marlais-0.5.12-diff/Makefile 2005-10-01 21:25:45.000000000 +1000 @@ -114,17 +113,16 @@ CC=gcc #NOT-NT # CC=$(cc) #NT -CFLAGS= -g -I$(INCDIRS) $(MARLAIS_FLAGS) $(CEXTRAS) #NOT-NT +CFLAGS= -g -I$(INCDIRS) $(MARLAIS_FLAGS) $(CEXTRAS) -I/usr/include/gc #NOT-NT # CFLAGS= $(cdebug) $(cvars) $(cflags) -i$(INCDIRS) $(MARLAIS_FLAGS) #NT -LIBS=-lm #NOT-NT +LIBS=-lm -lgc#NOT-NT # LIBS= #NT FLEXFLAGS = -I BYACCFLAGS = -d -v -t DISTDIR = /tmp/marlais-$(VERSION) -GCDIST = ../gc OBJS = alloc.o \ apply.o \ @@ -287,8 +283,8 @@ PROGRAM = marlais#NOT-NT # PROGRAM = marlais.exe#NT -$(PROGRAM): $(OBJS) $(GCOBJS) - $(CC) $(CFLAGS) -o $(PROGRAM) $ $(OBJS) $(GCOBJS) $(LIBS) #NOT-NT +$(PROGRAM): $(OBJS) + $(CC) $(CFLAGS) -o $(PROGRAM) $ $(OBJS) $(LIBS) #NOT-NT # $(link) $(ldebug) -subsystem:console -out $(PROGRAM) $(OBJS) $(GCOBJS) $(LIBS) #NT # a target for building parser/scanner on the Mac under MachTen. @@ -357,7 +353,7 @@ rlog -r$(PREVIOUS_RLOG_VERSION): RCS/* > ChangeLog # dependencies -alloc.o : alloc.c alloc.h object.h env.h symbol.h gc/gc.h error.h +alloc.o : alloc.c alloc.h object.h env.h symbol.h error.h apply.o : apply.c apply.h object.h alloc.h env.h class.h symbol.h eval.h error.h \ function.h keyword.h list.h print.h prim.h syntax.h table.h values.h vector.h array.o : array.c array.h object.h alloc.h env.h error.h list.h number.h prim.h \ @@ -376,7 +372,7 @@ classprec.o : classprec.c classprec-ll.c classprec.h classprec-ll.h object.h \ class.h symbol.h error.h list.h deque.o : deque.c deque.h object.h collection.h error.h list.h prim.h symbol.h -dylan.tab.o : dylan.tab.c boolean.h object.h bytestring.h error.h gc/gc.h globaldefs.h \ +dylan.tab.o : dylan.tab.c boolean.h object.h bytestring.h error.h globaldefs.h \ list.h number.h symbol.h table.h vector.h yystype.h dylan_lexer.h env.o : env.c env.h object.h alloc.h bytestring.h class.h symbol.h error.h eval.h \ function.h keyword.h list.h prim.h print.h table.h diff -ru marlais-0.5.12/main.c marlais-0.5.12-diff/main.c --- marlais-0.5.12/main.c 1995-09-05 03:43:44.000000000 +1000 +++ marlais-0.5.12-diff/main.c 2005-10-01 21:26:01.000000000 +1000 @@ -80,7 +80,7 @@ #endif #ifndef INIT_FILE -#define INIT_FILE "init.dyl" +#define INIT_FILE "/usr/share/marlais/init.dyl" #endif #ifndef VERSION diff -ru marlais-0.5.12/sys.c marlais-0.5.12-diff/sys.c --- marlais-0.5.12/sys.c 1995-09-05 03:44:35.000000000 +1000 +++ marlais-0.5.12-diff/sys.c 2005-10-01 21:11:25.000000000 +1000 @@ -35,7 +35,7 @@ #else -#include +#include #endif #include "sys.h"