More files to compile, small cleanups and various other changes needed

after arla update.

7 files changed, 55 insertions, 14 deletions

diff --git a/usr.sbin/afs/lib/libarla/Makefile.arla.inc b/usr.sbin/afs/lib/libarla/Makefile.arla.inc
index d83a1c3326b..e734a063889 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.arla.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.arla.inc
@@ -1,6 +1,8 @@
 SRCS	+= arlalib.c \
 	   fs_lib.c \
 	   ka-procs.c \
-	   tokens.c 
+	   tokens.c \
+	   print_version.c
+
 CFLAGS	+= -I${AFSSRC}/appl/lib
 .PATH:	${AFSSRC}/appl/lib
diff --git a/usr.sbin/afs/lib/libarla/Makefile.ko.inc b/usr.sbin/afs/lib/libarla/Makefile.ko.inc
index c0bf59b4d1b..ed995f6b0f9 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.ko.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.ko.inc
@@ -1,9 +1,27 @@
 ### ko stuff
+
+.PATH:	$(ROKENSRC)
+
 OS_VER	!= uname -r
 
-SRCS		+= koerror.c kocell.c ports.c vlmisc.c part.c agetarg.c
-SRCS		+= sysname.c
-CLEANFILES	+= sysname.c gensysname gensysname.o
+SRCS	+= koerror.c \
+	   kocell.c \
+	   ports.c \
+	   vlmisc.c \
+	   part.c \
+	   agetarg.c \
+	   uae.c \
+	   sysname.c \
+	   afs_uuid.c \
+	   misc.c \
+	   ko_resolve.c
+
+# resolve.c exists in roken as well *sigh*
+ko_resolve.c:
+	ln -sf $(AFSSRC)/lib/ko/resolve.c ko_resolve.c
+
+CLEANFILES	+= sysname.c gensysname gensysname.o getarg.o strupr.o \
+		   get_window_size.o
 CFLAGS		+= -I${AFSSRC}/lib/ko
 
 .PATH: ${AFSSRC}/lib/ko
@@ -12,8 +30,8 @@ CFLAGS		+= -I${AFSSRC}/lib/ko
 sysname.c: gensysname
 	./gensysname -c > sysname.c
 
-gensysname: gensysname.o agetarg.o
-	${HOSTCC} ${CFLAGS} -o gensysname gensysname.o agetarg.o ${LIBROKEN}
+gensysname: gensysname.o getarg.o strupr.o get_window_size.o
+	${HOSTCC} ${CFLAGS} -o gensysname gensysname.o getarg.o strupr.o get_window_size.o
 
 CLEANFILES+=	gensysname.o agetarg.o
 
diff --git a/usr.sbin/afs/lib/libarla/Makefile.lwp.inc b/usr.sbin/afs/lib/libarla/Makefile.lwp.inc
index ac2d8887986..cb19a87c17a 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.lwp.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.lwp.inc
@@ -33,6 +33,6 @@ process.S:
 	ln -s ${AFSSRC}/lwp/$$PROCESS_S process.S
 
 process.o: process.S
-	${CC} ${CFLAGS} -DHAVE_PIC -c process.S
+	${CC} ${CFLAGS} -DUSING_ASM -DHAVE_PIC -c process.S
 
 all:	lwp.h
\ No newline at end of file
diff --git a/usr.sbin/afs/lib/libarla/Makefile.rx.inc b/usr.sbin/afs/lib/libarla/Makefile.rx.inc
index 690954fb71d..8830202040b 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.rx.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.rx.inc
@@ -1,5 +1,15 @@
 ### rx stuff
-SRCS	+= rx_clock.c rx_event.c rx_user.c rx.c rx_globs.c rx_null.c \
-	   rx_misc.c rx_pkt.c rx_rdwr.c rx_multi.c rx_trace.c
+SRCS	+= rx_clock.c \
+	   rx_event.c \
+	   rx_user.c \
+	   rx.c \
+	   rx_globs.c \
+	   rx_null.c \
+	   rx_misc.c \
+	   rx_pkt.c \
+	   rx_rdwr.c \
+	   rx_multi.c \
+	   rx_trace.c
+
 CFLAGS	+= -I${AFSSRC}/rx -I${AFSSRC}
 .PATH: ${AFSSRC}/rx
diff --git a/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc b/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc
index 0550a00410e..eecc7895b94 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc
@@ -1,7 +1,15 @@
 ### rxdef stuff
+includes:	fs.h vldb.h cb.h pts.h bos.h volumeserver.h ubik.h bos.h ka.h
+
 ## No, cb.ss.c is _not_ a mistake. The _client_ is the callback server.
-SRCS		+= vldb.cs.c fs.cs.c cb.ss.c pts.cs.c \
-		   volumeserver.cs.c ubik.cs.c bos.cs.c ka.cs.c
+SRCS	+= vldb.cs.c \
+	   fs.cs.c \
+	   cb.ss.c \
+	   pts.cs.c \
+	   volumeserver.cs.c \
+	   ubik.cs.c \
+	   bos.cs.c \
+	   ka.cs.c
 
 CLEANFILES 	+= vldb.ss.c vldb.cs.c vldb.ydr.c vldb.ss.h vldb.cs.h vldb.h \
 		   fs.ss.c fs.cs.c fs.ydr.c fs.cs.h fs.ss.h fs.h \
diff --git a/usr.sbin/afs/lib/libarla/Makefile.rxkad.inc b/usr.sbin/afs/lib/libarla/Makefile.rxkad.inc
index dff5300d7d0..eba340e8477 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.rxkad.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.rxkad.inc
@@ -1,6 +1,8 @@
 ### rxkad stuff
-SRCS	+= rxk_locl.c rxk_clnt.c rxk_serv.c rxk_crpt.c \
-	   osi_alloc.c compat.c
+SRCS	+= rxk_locl.c \
+	   rxk_clnt.c \
+	   rxk_crpt.c \
+	   osi_alloc.c
 
 CFLAGS	+= -I${AFSSRC}/rxkad -I${DESTDIR}/usr/include/kerberosIV
 
diff --git a/usr.sbin/afs/lib/libarla/Makefile.util.inc b/usr.sbin/afs/lib/libarla/Makefile.util.inc
index 551c640cc7e..ad70e7d1882 100644
--- a/usr.sbin/afs/lib/libarla/Makefile.util.inc
+++ b/usr.sbin/afs/lib/libarla/Makefile.util.inc
@@ -1,6 +1,7 @@
 SRCS	+= log.c \
 	   hash.c \
 	   heap.c \
-	   list.c
+	   list.c \
+	   arlamath.c
 
 .PATH: ${AFSSRC}/util