update makefiles

GNUmakefile

@@ -2,10 +2,10 @@
 
 .PHONY: all
 
-all: tcpsnooper netstat
+all: tcpsnooper.cda netstat
 
-tcpsnooper : o/cda.a o/nscda.a o/debug.a
+tcpsnooper.cda : o/snooper.a 
-	iix -DKeepType=cda link o/cda o/nscda o/debug keep=tcpsnooper
+	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/snooper.a : snooper.c | o
-o/cda.a : cda.asm | cda.mac o
+	iix compile snooper.c keep=o/snooper
-	iix compile cda.asm keep=o/cda
-
-o/nscda.a : nscda.c | o
-	iix compile nscda.c keep=o/nscda
 
 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

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
+tcpsnooper.cda: snooper.o
-	$(CC) $(LDFLAGS) cda.o nscda.o debug.o $(LDLIBS) -o $@
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 	chtyp -t cda $@
 
 clean:
 	$(RM) *.o *.root *.r
 
 clobber: clean
-	$(RM) -f netstat netstat.cda
+	$(RM) -f netstat tcpsnooper