From 246c8a846411d02850c6cc4d8c3dd279cb9b6678 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Thu, 10 May 2018 17:19:57 -0400 Subject: [PATCH] main -> marlene. --- GNUmakefile | 18 +++++++++++------- makefile | 5 +++-- main.c => marlene.c | 0 3 files changed, 14 insertions(+), 9 deletions(-) rename main.c => marlene.c (100%) diff --git a/GNUmakefile b/GNUmakefile index 55d582b..7ea851a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,5 +1,5 @@ PROG = marlene -OBJS = o/main.a o/vt100.a o/telnet.a o/ansi.a o/chars.a o/marinetti.a o/display.a +OBJS = o/vt100.a o/telnet.a o/ansi.a o/chars.a o/marinetti.a o/display.a CC = occ --gno @@ -8,18 +8,21 @@ OPTIMIZE ?= 79 CFLAGS = -w-1 -O $(OPTIMIZE) ASMFLAGS = -$(PROG): $(OBJS) - $(RM) o/ansi.root - $(RM) o/chars.root +marlene: o/marlene.a $(OBJS) + $(CC) $(OBJS) -o $@ + +darlene: o/darlene.a $(OBJS) $(CC) $(OBJS) -o $@ -main.o: main.c + +marlene.o: marlene.c +darlene.o: darlene.c vt100.o: vt100.c CLAGS+=-r -ansi.o: ansi.asm -chars.o: chars.asm marinetti.o: marinetti.c CLAGS+=-r telnet.o: telnet.c CLAGS+=-r +ansi.o: ansi.asm +chars.o: chars.asm o : mkdir o @@ -29,6 +32,7 @@ o/%.a : %.c | o o/%.a : %.asm | o $(CC) -c $(ASMFLAGS) -o $@ $^ + $(RM) o/$*.root clean: diff --git a/makefile b/makefile index 569c0a2..4b939ef 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ PROG = marlene -OBJS = main.o vt100.o telnet.o ansi.o chars.o marinetti.o display.o +OBJS = marlene.o vt100.o telnet.o ansi.o chars.o marinetti.o display.o OPTIMIZE *= 79 @@ -11,7 +11,8 @@ $(PROG): $(OBJS) $(CC) $(CFLAGS) $(OBJS) -o $@ -main.o: main.c +marlene.o: marlene.c +darlene.o: darlene.c vt100.o: vt100.c ansi.o: ansi.asm chars.o: chars.asm diff --git a/main.c b/marlene.c similarity index 100% rename from main.c rename to marlene.c