From 35f2326f3cb9f218becbb38bd15c5eca63f2550d Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Thu, 17 Jan 2019 00:14:47 -0500
Subject: [PATCH] update makefiles

---
 GNUmakefile          | 24 +++++++++++++-----------
 makefile.mk          |  9 ++++-----
 nscda.c => snooper.c |  0
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename nscda.c => snooper.c (100%)

diff --git a/GNUmakefile b/GNUmakefile
index 3e5bec1..613ffa0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,10 +2,10 @@
 
 .PHONY: all
 
-all: tcpsnooper netstat
+all: tcpsnooper.cda netstat
 
-tcpsnooper : o/cda.a o/nscda.a o/debug.a
-	iix -DKeepType=cda link o/cda o/nscda o/debug keep=tcpsnooper
+tcpsnooper.cda : o/snooper.a 
+	iix -DKeepType=cda link o/snooper keep=tcpsnooper.cda
 
 netstat : o/netstat.a
 	iix link o/netstat keep=netstat
@@ -13,18 +13,20 @@ netstat : o/netstat.a
 o:
 	mkdir o
 
-cda.mac: cda.asm
-	iix macgen cda.asm cda.mac 13:ainclude:m16.= 13:orcainclude:m16.=
 
-
-o/cda.a : cda.asm | cda.mac o
-	iix compile cda.asm keep=o/cda
-
-o/nscda.a : nscda.c | o
-	iix compile nscda.c keep=o/nscda
+o/snooper.a : snooper.c | o
+	iix compile snooper.c keep=o/snooper
 
 o/netstat.a : netstat.c | o
 	iix compile netstat.c keep=o/netstat
 
+# no longer used.
+
+cda.mac: cda.asm
+	iix macgen cda.asm cda.mac 13:ainclude:m16.= 13:orcainclude:m16.=
+
+o/cda.a : cda.asm | cda.mac o
+	iix compile cda.asm keep=o/cda
+
 o/debug.a : debug.c ur.c | o
 	iix compile debug.c keep=o/debug
\ No newline at end of file
diff --git a/makefile.mk b/makefile.mk
index f77f0b5..9efc3b6 100644
--- a/makefile.mk
+++ b/makefile.mk
@@ -31,17 +31,16 @@
 # Kelvin's modified Orca C library includes an implementation of fdprintf()
 
 CFLAGS	+=  $(DEFINES) -v #-O
-LDLIBS += -l liborca
 
 netstat: netstat.o
-	$(CC) $(LDFLAGS) netstat.o $(LDLIBS) -o $@
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-tcpsnooper.cda: cda.o nscda.o debug.o
-	$(CC) $(LDFLAGS) cda.o nscda.o debug.o $(LDLIBS) -o $@
+tcpsnooper.cda: snooper.o
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 	chtyp -t cda $@
 
 clean:
 	$(RM) *.o *.root *.r
 
 clobber: clean
-	$(RM) -f netstat netstat.cda
+	$(RM) -f netstat tcpsnooper
diff --git a/nscda.c b/snooper.c
similarity index 100%
rename from nscda.c
rename to snooper.c