From 8b86c2d321fdae8dd553772aaf40e9612a8bcc38 Mon Sep 17 00:00:00 2001
From: Will Sowerbutts <will@sowerbutts.com>
Date: Sat, 3 Jan 2015 16:17:37 +0000
Subject: [PATCH] Minor Makefile fixes

Libary: Link syslib.lib to c.lib (which is the name fcc expects to use)

Applications: Use fcc to build, remove reference to env.c and uname.c
which are not present in the git repository.
---
 Applications/util/Makefile | 10 +++-------
 Library/libs/Makefile      |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Applications/util/Makefile b/Applications/util/Makefile
index 0f6c6151..aad0c8b0 100644
--- a/Applications/util/Makefile
+++ b/Applications/util/Makefile
@@ -2,6 +2,7 @@ CC = sdcc
 ASM = sdasz80
 AR = sdar
 LINKER = sdcc
+FCC = ../../Library/tools/fcc
 
 PROGLOAD=`(cat ../../Kernel/platform/config.h; echo PROGLOAD) | cpp -E | tail -n1`
 
@@ -38,7 +39,6 @@ SRCS  = banner.c \
 	du.c \
 	echo.c \
 	ed.c \
-	env.c \
 	false.c \
 	fdisk.c \
 	fgrep.c \
@@ -83,7 +83,6 @@ SRCS  = banner.c \
 	tr.c \
 	true.c \
 	umount.c \
-	uname.c \
 	uniq.c \
 	uud.c \
 	uue.c \
@@ -112,13 +111,10 @@ $(OBJSBAD): $(SRCSBAD)
 	$(CC) $(CC_CRAP) $(@:.rel=.c)
 
 .c.rel:
-	$(CC) $(CC_OPT) $(@:.rel=.c)
+	$(FCC) -c $<
 
 %: %.rel
-	$(LINKER) $(LINKER_OPT) ../../Library/libs/crt0.rel $< $(LIBS) -o $@.ihx
-	makebin -s 65536 $@.ihx $@.tmp
-	$(BINMAN) $(PROGLOAD) $@.tmp $@.map $@
-	chmod +x $@
+	$(FCC) $< -o $@
 
 clean:
 	rm -f $(OBJS) $(APPS) $(SRCS:.c=) core *~ *.asm *.lst *.sym *.map *.noi *.lk *.ihx *.tmp
diff --git a/Library/libs/Makefile b/Library/libs/Makefile
index bd17e602..d819b34e 100644
--- a/Library/libs/Makefile
+++ b/Library/libs/Makefile
@@ -72,6 +72,7 @@ syslib.lib: syscall.l libc.l sdccz80.lib
 	cp sdccz80.lib syslib.lib
 	$(AR) rc syslib.lib @syslib.l
 	$(AR) s syslib.lib
+	ln -s syslib.lib c.lib
 
 fuzix/syslib.l:
 	../tools/syscall
-- 
2.34.1