git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
rx: Make statistics interface use Atomics
[openafs.git] / src / libuafs / Makefile.common.in
diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index e4ad164..e8adae8 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -20,11 +20,13 @@ DES =../des
 LIB    =../lib
 NS_INCL =SRC/../afsweb/netscape_includes
 
+TOP_OBJ_AUTH = ${TOP_OBJDIR}/src/auth
 TOP_OBJ_FSINT = ${TOP_OBJDIR}/src/fsint
 TOP_OBJ_RXSTAT = ${TOP_OBJDIR}/src/rxstat
 TOP_OBJ_VLSERVER = ${TOP_OBJDIR}/src/vlserver
 
 TOP_SRC_AFS = ${TOP_SRCDIR}/afs
+TOP_SRC_AUTH = ${TOP_SRCDIR}/auth
 TOP_SRC_RXSTAT = ${TOP_SRCDIR}/rxstat
 TOP_SRC_FSINT = ${TOP_SRCDIR}/fsint
 TOP_SRC_RX = ${TOP_SRCDIR}/rx
@@ -39,7 +41,6 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \
         -I${TOP_SRCDIR}/rx \
         -I${TOP_SRCDIR}/rx/UKERNEL \
         -I${TOP_SRCDIR}/rxkad \
-        -I${TOP_SRCDIR}/rxkad/domestic \
         -I${TOP_SRCDIR}/util \
         -I${TOP_OBJDIR}/src \
         -I${TOP_OBJDIR}/src/afs/UKERNEL \
@@ -50,8 +51,9 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \
         -I${TOP_OBJDIR}/src/fsint \
         -I${TOP_OBJDIR}/src/vlserver \
        -I${TOP_OBJDIR}/src/libuafs \
+       -I${TOP_OBJDIR}/src/auth \
         -I${TOP_INCDIR} \
-        -I${TOP_INCDIR}/afs 
+        -I${TOP_INCDIR}/afs @INCLUDE_libintl@
 
 # Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
 
@@ -74,7 +76,7 @@ webinstall: all \
        ${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
 
 linktest: UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a
-       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a $(TEST_LIBS) $(XLIBS)
+       $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a $(TEST_LIBS) $(XLIBS)
 
 
 CRULE1=        $(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
@@ -87,6 +89,7 @@ UAFSOBJ = \
        $(UOBJ)/afs_error.o \
        $(UOBJ)/afs_axscache.o  \
        $(UOBJ)/afs_buffer.o    \
+       $(UOBJ)/afs_bypasscache.o \
        $(UOBJ)/afs_callback.o  \
        $(UOBJ)/afs_cbqueue.o    \
        $(UOBJ)/afs_cell.o \
@@ -95,6 +98,7 @@ UAFSOBJ = \
        $(UOBJ)/afs_daemons.o   \
        $(UOBJ)/afs_dcache.o \
        $(UOBJ)/afs_dir.o               \
+       $(UOBJ)/afs_disconnected.o      \
        $(UOBJ)/afs_dynroot.o \
        $(UOBJ)/afs_icl.o \
        $(UOBJ)/afs_init.o \
@@ -102,15 +106,18 @@ UAFSOBJ = \
        $(UOBJ)/afs_mariner.o \
        $(UOBJ)/afs_memcache.o  \
        $(UOBJ)/afs_md5.o       \
+       $(UOBJ)/afs_fetchstore.o        \
        $(UOBJ)/afs_osidnlc.o   \
        $(UOBJ)/afs_osi_pag.o \
        $(UOBJ)/afs_segments.o \
        $(UOBJ)/afs_server.o \
        $(UOBJ)/afs_stat.o \
        $(UOBJ)/afs_syscall.o \
+       $(UOBJ)/afs_tokens.o \
        $(UOBJ)/afs_user.o \
        $(UOBJ)/afs_util.o \
        $(UOBJ)/afs_vcache.o \
+       $(UOBJ)/afs_warn.o \
        $(UOBJ)/afs_osi_uio.o \
        $(UOBJ)/afs_vnop_access.o \
        $(UOBJ)/afs_vnop_attrs.o \
@@ -133,12 +140,17 @@ UAFSOBJ = \
        $(UOBJ)/afs_pioctl.o \
        $(UOBJ)/osi_vfsops.o \
        $(UOBJ)/afs_usrops.o \
+       $(UOBJ)/afsd.o \
+       $(UOBJ)/afsd_uafs.o \
+       $(UOBJ)/xdr.o \
        $(UOBJ)/xdr_afsuuid.o \
        $(UOBJ)/afs_uuid.o \
        $(UOBJ)/assert.o \
        $(UOBJ)/osi_vnodeops.o \
        $(UOBJ)/osi_vm.o \
        $(UOBJ)/osi_groups.o \
+       $(UOBJ)/osi_gcpags.o \
+       $(UOBJ)/osi_vcache.o \
        $(UOBJ)/afsaux.o \
        $(UOBJ)/Kvice.xdr.o \
        $(UOBJ)/xdr_arrayn.o \
@@ -149,13 +161,16 @@ UAFSOBJ = \
        $(UOBJ)/rx_clock.o \
        $(UOBJ)/rx_event.o \
        $(UOBJ)/rx_globals.o \
+       $(UOBJ)/rx_identity.o \
        $(UOBJ)/rx_kmutex.o \
        $(UOBJ)/rx_knet.o \
        $(UOBJ)/rx_kcommon.o \
        $(UOBJ)/rx_misc.o \
        $(UOBJ)/rx_multi.o \
        $(UOBJ)/rx_null.o \
+       $(UOBJ)/rx_opaque.o \
        $(UOBJ)/rx_getaddr.o \
+       $(UOBJ)/rx_stats.o \
        $(UOBJ)/rx_packet.o \
        $(UOBJ)/rx_conncache.o \
        $(UOBJ)/xdr_rx.o \
@@ -193,7 +208,7 @@ UAFSOBJ = \
        $(UOBJ)/ptuser.o \
        $(UOBJ)/pterror.o \
        $(UOBJ)/ticket.o \
-       $(UOBJ)/token.o \
+       $(UOBJ)/katoken.o \
        $(UOBJ)/ubik_int.cs.o \
        $(UOBJ)/ubik_int.xdr.o \
        $(UOBJ)/ubikclient.o \
@@ -203,7 +218,11 @@ UAFSOBJ = \
        $(UOBJ)/Krxstat.xdr.o \
        $(UOBJ)/rxstat.o \
        $(UOBJ)/xdr_int32.o \
-       $(UOBJ)/xdr_int64.o
+       $(UOBJ)/xdr_int64.o \
+       $(UOBJ)/token.xdr.o \
+       $(UOBJ)/token.o \
+       $(UOBJ)/xdr_mem.o \
+       $(UOBJ)/xdr_len.o
 
 AFSWEBOBJ = \
        $(WEBOBJ)/afs_atomlist.o \
@@ -212,6 +231,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/afs_error.o \
        $(WEBOBJ)/afs_axscache.o \
        $(WEBOBJ)/afs_buffer.o \
+       $(WEBOBJ)/afs_bypasscache.o \
        $(WEBOBJ)/afs_callback.o \
        $(WEBOBJ)/afs_cbqueue.o \
        $(WEBOBJ)/afs_cell.o \
@@ -220,6 +240,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/afs_daemons.o \
        $(WEBOBJ)/afs_dcache.o \
        $(WEBOBJ)/afs_dir.o \
+       $(WEBOBJ)/afs_disconnected.o \
        $(WEBOBJ)/afs_dynroot.o \
        $(WEBOBJ)/afs_icl.o \
        $(WEBOBJ)/afs_init.o \
@@ -227,15 +248,18 @@ AFSWEBOBJ = \
        $(WEBOBJ)/afs_mariner.o \
        $(WEBOBJ)/afs_memcache.o \
        $(WEBOBJ)/afs_md5.o \
+       $(WEBOBJ)/afs_fetchstore.o \
        $(WEBOBJ)/afs_osidnlc.o \
        $(WEBOBJ)/afs_osi_pag.o \
        $(WEBOBJ)/afs_segments.o \
        $(WEBOBJ)/afs_server.o \
        $(WEBOBJ)/afs_stat.o \
        $(WEBOBJ)/afs_syscall.o \
+       $(WEBOBJ)/afs_tokens.o \
        $(WEBOBJ)/afs_user.o \
        $(WEBOBJ)/afs_util.o \
        $(WEBOBJ)/afs_vcache.o \
+       $(WEBOBJ)/afs_warn.o \
        $(WEBOBJ)/afs_osi_uio.o \
        $(WEBOBJ)/afs_vnop_access.o \
        $(WEBOBJ)/afs_vnop_attrs.o \
@@ -258,12 +282,17 @@ AFSWEBOBJ = \
        $(WEBOBJ)/afs_pioctl.o \
        $(WEBOBJ)/osi_vfsops.o \
        $(WEBOBJ)/afs_usrops.o \
+       $(WEBOBJ)/afsd.o \
+       $(WEBOBJ)/afsd_uafs.o \
+       $(WEBOBJ)/xdr.o \
        $(WEBOBJ)/xdr_afsuuid.o \
        $(WEBOBJ)/afs_uuid.o \
        $(WEBOBJ)/assert.o \
        $(WEBOBJ)/osi_vnodeops.o \
        $(WEBOBJ)/osi_vm.o \
        $(WEBOBJ)/osi_groups.o \
+       $(WEBOBJ)/osi_gcpags.o \
+       $(WEBOBJ)/osi_vcache.o \
        $(WEBOBJ)/afsaux.o \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
@@ -274,13 +303,16 @@ AFSWEBOBJ = \
        $(WEBOBJ)/rx_clock.o \
        $(WEBOBJ)/rx_event.o \
        $(WEBOBJ)/rx_globals.o \
+       $(WEBOBJ)/rx_identity.o \
        $(WEBOBJ)/rx_kmutex.o \
        $(WEBOBJ)/rx_knet.o \
        $(WEBOBJ)/rx_kcommon.o \
        $(WEBOBJ)/rx_misc.o \
        $(WEBOBJ)/rx_multi.o \
        $(WEBOBJ)/rx_null.o \
+       $(WEBOBJ)/rx_opaque.o \
        $(WEBOBJ)/rx_getaddr.o \
+       $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
        $(WEBOBJ)/xdr_rx.o \
@@ -319,7 +351,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/pterror.o \
        $(WEBOBJ)/securehash.o \
        $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/katoken.o \
        $(WEBOBJ)/ubik_int.cs.o \
        $(WEBOBJ)/ubik_int.xdr.o \
        $(WEBOBJ)/ubikclient.o \
@@ -328,8 +360,11 @@ AFSWEBOBJ = \
        $(WEBOBJ)/nsafs.o \
        $(WEBOBJ)/Krxstat.ss.o \
        $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o
-
+       $(WEBOBJ)/rxstat.o \
+       $(WEBOBJ)/token.xdr.o \
+       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/xdr_mem.o \
+       $(WEBOBJ)/xdr_len.o
 
 AFSWEBOBJKRB = \
        $(WEBOBJ)/afs_atomlist.o \
@@ -338,6 +373,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/afs_error.o \
        $(WEBOBJ)/afs_axscache.o \
        $(WEBOBJ)/afs_buffer.o \
+       $(WEBOBJ)/afs_bypasscache.o \
        $(WEBOBJ)/afs_callback.o \
        $(WEBOBJ)/afs_cbqueue.o \
        $(WEBOBJ)/afs_cell.o \
@@ -347,21 +383,25 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/afs_dcache.o \
        $(WEBOBJ)/afs_dir.o \
        $(WEBOBJ)/afs_dynroot.o \
+       $(WEBOBJ)/afs_disconnected.o \
        $(WEBOBJ)/afs_icl.o \
        $(WEBOBJ)/afs_init.o \
        $(WEBOBJ)/afs_lock.o \
        $(WEBOBJ)/afs_mariner.o \
        $(WEBOBJ)/afs_memcache.o \
        $(WEBOBJ)/afs_md5.o \
+       $(WEBOBJ)/afs_fetchstore.o \
        $(WEBOBJ)/afs_osidnlc.o \
        $(WEBOBJ)/afs_osi_pag.o \
        $(WEBOBJ)/afs_segments.o \
        $(WEBOBJ)/afs_server.o \
        $(WEBOBJ)/afs_stat.o \
        $(WEBOBJ)/afs_syscall.o \
+       $(WEBOBJ)/afs_tokens.o \
        $(WEBOBJ)/afs_user.o \
        $(WEBOBJ)/afs_util.o \
        $(WEBOBJ)/afs_vcache.o \
+       $(WEBOBJ)/afs_warn.o \
        $(WEBOBJ)/afs_osi_uio.o \
        $(WEBOBJ)/afs_vnop_access.o \
        $(WEBOBJ)/afs_vnop_attrs.o \
@@ -384,9 +424,13 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/afs_pioctl.o \
        $(WEBOBJ)/osi_vfsops.o \
        $(WEBOBJ)/afs_usrops.o \
+       $(WEBOBJ)/afsd.o \
+       $(WEBOBJ)/afsd_uafs.o \
        $(WEBOBJ)/osi_vnodeops.o \
        $(WEBOBJ)/osi_vm.o \
        $(WEBOBJ)/osi_groups.o \
+       $(WEBOBJ)/osi_gcpags.o \
+       $(WEBOBJ)/osi_vcache.o \
        $(WEBOBJ)/afsaux.o \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
@@ -397,13 +441,16 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/rx_clock.o \
        $(WEBOBJ)/rx_event.o \
        $(WEBOBJ)/rx_globals.o \
+       $(WEBOBJ)/rx_identity.o \
        $(WEBOBJ)/rx_kmutex.o \
        $(WEBOBJ)/rx_knet.o \
        $(WEBOBJ)/rx_kcommon.o \
        $(WEBOBJ)/rx_misc.o \
        $(WEBOBJ)/rx_multi.o \
        $(WEBOBJ)/rx_null.o \
+       $(WEBOBJ)/rx_opaque.o \
        $(WEBOBJ)/rx_getaddr.o \
+       $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
        $(WEBOBJ)/xdr_rx.o \
@@ -442,7 +489,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/pterror.o \
        $(WEBOBJ)/securehash.o \
        $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/katoken.o \
        $(WEBOBJ)/ubik_int.cs.o \
        $(WEBOBJ)/ubik_int.xdr.o \
        $(WEBOBJ)/ubikclient.o \
@@ -450,7 +497,11 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/nsafs.o \
        $(WEBOBJ)/Krxstat.ss.o \
        $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o
+       $(WEBOBJ)/rxstat.o \
+       $(WEBOBJ)/token.xdr.o \
+       $(WEBOBJ)/token.o \
+       $(WEBOBJ)/xdr_mem.o \
+       $(WEBOBJ)/xdr_len.o
 
 JUAFSOBJ = \
        $(JUAFS)/afs_atomlist.o \
@@ -459,6 +510,7 @@ JUAFSOBJ = \
        $(JUAFS)/afs_error.o \
        $(JUAFS)/afs_axscache.o  \
        $(JUAFS)/afs_buffer.o   \
+       $(JUAFS)/afs_bypasscache.o \
        $(JUAFS)/afs_callback.o \
        $(JUAFS)/afs_cbqueue.o    \
        $(JUAFS)/afs_cell.o \
@@ -468,21 +520,25 @@ JUAFSOBJ = \
        $(JUAFS)/afs_dcache.o \
        $(JUAFS)/afs_dir.o \
        $(JUAFS)/afs_dynroot.o \
+       $(JUAFS)/afs_disconnected.o \
        $(JUAFS)/afs_icl.o \
        $(JUAFS)/afs_init.o \
        $(JUAFS)/afs_lock.o     \
        $(JUAFS)/afs_mariner.o \
        $(JUAFS)/afs_memcache.o \
        $(JUAFS)/afs_md5.o \
+       $(JUAFS)/afs_fetchstore.o       \
        $(JUAFS)/afs_osidnlc.o  \
        $(JUAFS)/afs_osi_pag.o \
        $(JUAFS)/afs_segments.o \
        $(JUAFS)/afs_server.o \
        $(JUAFS)/afs_stat.o \
        $(JUAFS)/afs_syscall.o \
+       $(JUAFS)/afs_tokens.o \
        $(JUAFS)/afs_user.o \
        $(JUAFS)/afs_util.o \
        $(JUAFS)/afs_vcache.o \
+       $(JUAFS)/afs_warn.o \
        $(JUAFS)/afs_osi_uio.o \
        $(JUAFS)/afs_vnop_access.o \
        $(JUAFS)/afs_vnop_attrs.o \
@@ -505,12 +561,17 @@ JUAFSOBJ = \
        $(JUAFS)/afs_pioctl.o \
        $(JUAFS)/osi_vfsops.o \
        $(JUAFS)/afs_usrops.o \
+       $(JUAFS)/afsd.o \
+       $(JUAFS)/afsd_uafs.o \
+       $(JUAFS)/xdr.o \
        $(JUAFS)/xdr_afsuuid.o \
        $(JUAFS)/afs_uuid.o \
        $(JUAFS)/assert.o \
        $(JUAFS)/osi_vnodeops.o \
        $(JUAFS)/osi_vm.o \
        $(JUAFS)/osi_groups.o \
+       $(JUAFS)/osi_gcpags.o \
+       $(JUAFS)/osi_vcache.o \
        $(JUAFS)/afsaux.o \
        $(JUAFS)/Kvice.xdr.o \
        $(JUAFS)/xdr_arrayn.o \
@@ -521,12 +582,15 @@ JUAFSOBJ = \
        $(JUAFS)/rx_clock.o \
        $(JUAFS)/rx_event.o \
        $(JUAFS)/rx_globals.o \
+       $(JUAFS)/rx_identity.o \
        $(JUAFS)/rx_knet.o \
        $(JUAFS)/rx_kcommon.o \
        $(JUAFS)/rx_misc.o \
        $(JUAFS)/rx_multi.o \
        $(JUAFS)/rx_null.o \
+       $(JUAFS)/rx_opaque.o \
        $(JUAFS)/rx_getaddr.o \
+       $(JUAFS)/rx_stats.o \
        $(JUAFS)/rx_packet.o \
        $(JUAFS)/rx_conncache.o \
        $(JUAFS)/xdr_rx.o \
@@ -564,7 +628,7 @@ JUAFSOBJ = \
        $(JUAFS)/ptuser.o \
        $(JUAFS)/pterror.o \
        $(JUAFS)/ticket.o \
-       $(JUAFS)/token.o \
+       $(JUAFS)/katoken.o \
        $(JUAFS)/ubik_int.cs.o \
        $(JUAFS)/ubik_int.xdr.o \
        $(JUAFS)/ubikclient.o \
@@ -573,7 +637,11 @@ JUAFSOBJ = \
        $(JUAFS)/Krxstat.ss.o \
        $(JUAFS)/Krxstat.xdr.o \
        $(JUAFS)/rxstat.o \
-       $(JUAFS)/xdr_int64.o
+       $(JUAFS)/xdr_int64.o \
+       $(JUAFS)/token.xdr.o \
+       $(JUAFS)/token.o \
+       $(JUAFS)/xdr_mem.o \
+       $(JUAFS)/xdr_len.o
 
 # Compilation rules
 
@@ -589,6 +657,8 @@ $(UOBJ)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE1)
 $(UOBJ)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE1)
+$(UOBJ)/afs_bypasscache.o: $(TOP_SRC_AFS)/afs_bypasscache.c
+       $(CRULE1)
 $(UOBJ)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE1)
 $(UOBJ)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
@@ -597,6 +667,8 @@ $(UOBJ)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE1)
 $(UOBJ)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE1)
+$(UOBJ)/afs_disconnected.o: $(TOP_SRC_AFS)/afs_disconnected.c
+       $(CRULE1)
 $(UOBJ)/afs_error.o: $(TOP_SRC_AFS)/afs_error.c
        $(CRULE1)
 $(UOBJ)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c
@@ -613,12 +685,16 @@ $(UOBJ)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE1)
 $(UOBJ)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE1)
+$(UOBJ)/afs_tokens.o: $(TOP_SRC_AFS)/afs_tokens.c
+       $(CRULE1)
 $(UOBJ)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE1)
 $(UOBJ)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE1)
 $(UOBJ)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE1)
+$(UOBJ)/afs_warn.o: $(TOP_SRC_AFS)/afs_warn.c
+       $(CRULE1)
 $(UOBJ)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE1)
 $(UOBJ)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
@@ -675,11 +751,13 @@ $(UOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
 $(UOBJ)/afs_md5.o: $(TOP_SRC_AFS)/afs_md5.c
        $(CRULE1)
+$(UOBJ)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c
+       $(CRULE1)
 $(UOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-$(UOBJ)/fcrypt.o:      $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+$(UOBJ)/fcrypt.o:      $(TOP_SRC_RXKAD)/fcrypt.c
        $(CRULE1)
-$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
+$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c
        $(CRULE1)
 $(UOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
@@ -699,14 +777,20 @@ $(UOBJ)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE1)
 $(UOBJ)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE1)
+$(UOBJ)/rx_identity.o: $(TOP_SRC_RX)/rx_identity.c
+       $(CRULE1)
 $(UOBJ)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE1)
 $(UOBJ)/rx_multi.o: $(TOP_SRC_RX)/rx_multi.c
        $(CRULE1)
 $(UOBJ)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE1)
+$(UOBJ)/rx_opaque.o: $(TOP_SRC_RX)/rx_opaque.c
+       $(CRULE1)
 $(UOBJ)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE1)
+$(UOBJ)/rx_stats.o: $(TOP_SRC_RX)/rx_stats.c
+       $(CRULE1)
 $(UOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
@@ -719,18 +803,28 @@ $(UOBJ)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
        $(CRULE1)
 $(UOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
        $(CRULE1)
+$(UOBJ)/afsd.o: $(TOP_SRCDIR)/afsd/afsd.c
+       $(CRULE1) @CFLAGS_NOERROR@
+$(UOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
+       $(CRULE1)
 $(UOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE1) -o afs_uuid.o
 $(UOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
        $(CRULE1)
 $(UOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE1)
+$(UOBJ)/xdr.o: $(TOP_SRCDIR)/rx/xdr.c
+       $(CRULE1)
 $(UOBJ)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
        $(CRULE1)
 $(UOBJ)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
        $(CRULE1)
 $(UOBJ)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
        $(CRULE1)
+$(UOBJ)/osi_gcpags.o: $(TOP_SRC_AFS)/UKERNEL/osi_gcpags.c
+       $(CRULE1)
+$(UOBJ)/osi_vcache.o: $(TOP_SRC_AFS)/UKERNEL/osi_vcache.c
+       $(CRULE1)
 $(UOBJ)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE1)
 $(UOBJ)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
@@ -758,11 +852,11 @@ $(UOBJ)/afs_icl.o: $(TOP_SRC_AFS)/afs_icl.c
 $(UOBJ)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(UOBJ)/afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c
-       $(CRULE1) -DAFS_NONFSTRANS
+       $(CRULE1) @CFLAGS_NOERROR@ -DAFS_NONFSTRANS
 $(UOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(UOBJ)/ktc.o:         $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE1)
+       $(CRULE1) @CFLAGS_NOERROR@
 $(UOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
        $(CRULE1)
 $(UOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
@@ -791,7 +885,7 @@ $(UOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
        $(CRULE1)
 $(UOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
        $(CRULE1)
-$(UOBJ)/token.o: $(TOP_SRCDIR)/kauth/token.c
+$(UOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
        $(CRULE1)
 $(UOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
        $(CRULE1)
@@ -833,12 +927,20 @@ $(UOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE1)
 $(UOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE1)
+$(UOBJ)/token.xdr.o: $(TOP_OBJ_AUTH)/token.xdr.c
+       $(CRULE1)
+$(UOBJ)/token.o: $(TOP_SRCDIR)/auth/token.c
+       $(CRULE1)
+$(UOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+       $(CRULE1)
+$(UOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+       $(CRULE1)
 
 # These files are for the netscape plugin
 
-$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util//afs_atomlist.c
+$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
        $(CRULE2)
-$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
+$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
        $(CRULE2)
 $(WEBOBJ)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
        $(CRULE2)
@@ -846,12 +948,16 @@ $(WEBOBJ)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE2)
 $(WEBOBJ)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE2)
+$(WEBOBJ)/afs_bypasscache.o: $(TOP_SRC_AFS)/afs_bypasscache.c
+       $(CRULE2)
 $(WEBOBJ)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE2)
 $(WEBOBJ)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
        $(CRULE2)
 $(WEBOBJ)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE2)
+$(WEBOBJ)/afs_disconnected.o: $(TOP_SRC_AFS)/afs_disconnected.c
+       $(CRULE2)
 $(WEBOBJ)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE2)
 $(WEBOBJ)/afs_error.o: $(TOP_SRC_AFS)/afs_error.c
@@ -870,12 +976,16 @@ $(WEBOBJ)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE2)
 $(WEBOBJ)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE2)
+$(WEBOBJ)/afs_tokens.o: $(TOP_SRC_AFS)/afs_tokens.c
+       $(CRULE2)
 $(WEBOBJ)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE2)
 $(WEBOBJ)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE2)
 $(WEBOBJ)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE2)
+$(WEBOBJ)/afs_warn.o: $(TOP_SRC_AFS)/afs_warn.c
+       $(CRULE2)
 $(WEBOBJ)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE2)
 $(WEBOBJ)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
@@ -932,11 +1042,13 @@ $(WEBOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE2)
 $(WEBOBJ)/afs_md5.o: $(TOP_SRC_AFS)/afs_md5.c
        $(CRULE2)
+$(WEBOBJ)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c
+       $(CRULE2)
 $(WEBOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE2)
-$(WEBOBJ)/fcrypt.o:    $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+$(WEBOBJ)/fcrypt.o:    $(TOP_SRC_RXKAD)/fcrypt.c
        $(CRULE2)
-$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
+$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c
        $(CRULE2)
 $(WEBOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE2)
@@ -956,14 +1068,20 @@ $(WEBOBJ)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE2)
 $(WEBOBJ)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE2)
+$(WEBOBJ)/rx_identity.o: $(TOP_SRC_RX)/rx_identity.c
+       $(CRULE2)
 $(WEBOBJ)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE2)
 $(WEBOBJ)/rx_multi.o: $(TOP_SRC_RX)/rx_multi.c
        $(CRULE2)
 $(WEBOBJ)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE2)
+$(WEBOBJ)/rx_opaque.o: $(TOP_SRC_RX)/rx_opaque.c
+       $(CRULE2)
 $(WEBOBJ)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE2)
+$(WEBOBJ)/rx_stats.o: $(TOP_SRC_RX)/rx_stats.c
+       $(CRULE2)
 $(WEBOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE2)
 $(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
@@ -972,18 +1090,28 @@ $(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE2)
 $(WEBOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
        $(CRULE2)
+$(WEBOBJ)/afsd.o: $(TOP_SRCDIR)/afsd/afsd.c
+       $(CRULE2) @CFLAGS_NOERROR@
+$(WEBOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
+       $(CRULE2)
 $(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE2) -o afs_uuid.o
 $(WEBOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
        $(CRULE1)
 $(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE2)
+$(WEBOBJ)/xdr.o: $(TOP_SRCDIR)/rx/xdr.c
+       $(CRULE2)
 $(WEBOBJ)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
        $(CRULE2)
 $(WEBOBJ)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
        $(CRULE2)
 $(WEBOBJ)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
        $(CRULE2)
+$(WEBOBJ)/osi_gcpags.o: $(TOP_SRC_AFS)/UKERNEL/osi_gcpags.c
+       $(CRULE2)
+$(WEBOBJ)/osi_vcache.o: $(TOP_SRC_AFS)/UKERNEL/osi_vcache.c
+       $(CRULE2)
 $(WEBOBJ)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE2)
 $(WEBOBJ)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
@@ -1011,13 +1139,13 @@ $(WEBOBJ)/afs_icl.o: $(TOP_SRC_AFS)/afs_icl.c
 $(WEBOBJ)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE2) -DAFS_NONFSTRANS
 $(WEBOBJ)/afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c
-       $(CRULE2) -DAFS_NONFSTRANS
+       $(CRULE2) @CFLAGS_NOERROR@ -DAFS_NONFSTRANS
 $(WEBOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE2) -DAFS_NONFSTRANS
 $(WEBOBJ)/ktc.o:       $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE2)
+       $(CRULE2) @CFLAGS_NOERROR@
 $(WEBOBJ)/ktc.krb.o:   $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC 
+       $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC @CFLAGS_NOERROR@
        mv ktc.o ktc.krb.o
 $(WEBOBJ)/securehash.o: $(TOP_SRCDIR)/afsweb/securehash.c
        $(CRULE2)
@@ -1051,7 +1179,7 @@ $(WEBOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
        $(CRULE2)
 $(WEBOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
        $(CRULE2)
-$(WEBOBJ)/token.o: $(TOP_SRCDIR)/kauth/token.c
+$(WEBOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
        $(CRULE2)
 $(WEBOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
        $(CRULE2)
@@ -1093,13 +1221,21 @@ $(WEBOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE2)
 $(WEBOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE2)
+$(WEBOBJ)/token.xdr.o: $(TOP_OBJ_AUTH)/token.xdr.c
+       $(CRULE2)
+$(WEBOBJ)/token.o: $(TOP_SRCDIR)/auth/token.c
+       $(CRULE1)
+$(WEBOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+       $(CRULE2)
+$(WEBOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+       $(CRULE2)
 
 # These are for libjuafs.a 
 # Used for linking with libafsauthent and libafsrpc
 
 $(JUAFS)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
        $(CRULE1)
-$(JUAFS)/afs_lhash.o: $(TOP_SRCDIR)/util//afs_lhash.c
+$(JUAFS)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
        $(CRULE1)
 $(JUAFS)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
        $(CRULE1)
@@ -1107,12 +1243,16 @@ $(JUAFS)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
        $(CRULE1)
 $(JUAFS)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
        $(CRULE1)
+$(JUAFS)/afs_bypasscache.o: $(TOP_SRC_AFS)/afs_bypasscache.c
+       $(CRULE1)
 $(JUAFS)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
        $(CRULE1)
 $(JUAFS)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
        $(CRULE1)
 $(JUAFS)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
        $(CRULE1)
+$(JUAFS)/afs_disconnected.o: $(TOP_SRC_AFS)/afs_disconnected.c
+       $(CRULE1)
 $(JUAFS)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
        $(CRULE1)
 $(JUAFS)/afs_error.o: $(TOP_SRC_AFS)/afs_error.c
@@ -1131,12 +1271,16 @@ $(JUAFS)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
        $(CRULE1)
 $(JUAFS)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
        $(CRULE1)
+$(JUAFS)/afs_tokens.o: $(TOP_SRC_AFS)/afs_tokens.c
+       $(CRULE1)
 $(JUAFS)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
        $(CRULE1)
 $(JUAFS)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
        $(CRULE1)
 $(JUAFS)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
        $(CRULE1)
+$(JUAFS)/afs_warn.o: $(TOP_SRC_AFS)/afs_warn.c
+       $(CRULE1)
 $(JUAFS)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
        $(CRULE1)
 $(JUAFS)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
@@ -1193,11 +1337,13 @@ $(JUAFS)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
 $(JUAFS)/afs_md5.o: $(TOP_SRC_AFS)/afs_md5.c
        $(CRULE1)
+$(JUAFS)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c
+       $(CRULE1)
 $(JUAFS)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-$(JUAFS)/fcrypt.o:     $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+$(JUAFS)/fcrypt.o:     $(TOP_SRC_RXKAD)/fcrypt.c
        $(CRULE1)
-$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
+$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c
        $(CRULE1)
 $(JUAFS)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
@@ -1217,14 +1363,20 @@ $(JUAFS)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
        $(CRULE1)
 $(JUAFS)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
        $(CRULE1)
+$(JUAFS)/rx_identity.o: $(TOP_SRC_RX)/rx_identity.c
+       $(CRULE1)
 $(JUAFS)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
        $(CRULE1)
 $(JUAFS)/rx_multi.o: $(TOP_SRC_RX)/rx_multi.c
        $(CRULE1)
 $(JUAFS)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
        $(CRULE1)
+$(JUAFS)/rx_opaque.o: $(TOP_SRC_RX)/rx_opaque.c
+       $(CRULE1)
 $(JUAFS)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
        $(CRULE1)
+$(JUAFS)/rx_stats.o: $(TOP_SRC_RX)/rx_stats.c
+       $(CRULE1)
 $(JUAFS)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
@@ -1235,18 +1387,28 @@ $(JUAFS)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
        $(CRULE1)
 $(JUAFS)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
        $(CRULE1)
+$(JUAFS)/afsd.o: $(TOP_SRCDIR)/afsd/afsd.c
+       $(CRULE1) @CFLAGS_NOERROR@
+$(JUAFS)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
+       $(CRULE1)
 $(JUAFS)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE1) -o afs_uuid.o
 $(JUAFS)/assert.o: $(TOP_SRCDIR)/util/assert.c
        $(CRULE1)
 $(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE1)
+$(JUAFS)/xdr.o: $(TOP_SRCDIR)/rx/xdr.c
+       $(CRULE1)
 $(JUAFS)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
        $(CRULE1)
 $(JUAFS)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
        $(CRULE1)
 $(JUAFS)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
        $(CRULE1)
+$(JUAFS)/osi_gcpags.o: $(TOP_SRC_AFS)/UKERNEL/osi_gcpags.c
+       $(CRULE1)
+$(JUAFS)/osi_vcache.o: $(TOP_SRC_AFS)/UKERNEL/osi_vcache.c
+       $(CRULE1)
 $(JUAFS)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
        $(CRULE1)
 $(JUAFS)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
@@ -1272,11 +1434,11 @@ $(JUAFS)/afs_icl.o: $(TOP_SRC_AFS)/afs_icl.c
 $(JUAFS)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(JUAFS)/afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c
-       $(CRULE1) -DAFS_NONFSTRANS
+       $(CRULE1) @CFLAGS_NOERROR@ -DAFS_NONFSTRANS
 $(JUAFS)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(JUAFS)/ktc.o:        $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE1)
+       $(CRULE1) @CFLAGS_NOERROR@
 $(JUAFS)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
        $(CRULE1)
 $(JUAFS)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
@@ -1305,7 +1467,7 @@ $(JUAFS)/user.o: $(TOP_SRCDIR)/kauth/user.c
        $(CRULE1)
 $(JUAFS)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
        $(CRULE1)
-$(JUAFS)/token.o: $(TOP_SRCDIR)/kauth/token.c
+$(JUAFS)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
        $(CRULE1)
 $(JUAFS)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
        $(CRULE1)
@@ -1347,7 +1509,14 @@ $(JUAFS)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
        $(CRULE1)
 $(JUAFS)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
        $(CRULE1)
-
+$(JUAFS)/token.xdr.o: $(TOP_OBJ_AUTH)/token.xdr.c
+       $(CRULE1)
+$(JUAFS)/token.o: $(TOP_SRCDIR)/auth/token.c
+       $(CRULE1)
+$(JUAFS)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
+       $(CRULE1)
+$(JUAFS)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
+       $(CRULE1)
 
 clean:
        -$(RM) -rf UAFS* JUAFS* AFSWEB* nsapi des afs afsint config rx
@@ -1397,7 +1566,7 @@ AFSWEB:
        mkdir -p $@
 
 setup_common:
-       -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi
+       -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi afsd
        -ln -s /usr/include/sys h
        -ln -s /usr/include/net net 
        -ln -s /usr/include/netinet netinet
@@ -1406,6 +1575,7 @@ setup_common:
        -ln -s /usr/include/nfs nfs
        -ln -s /usr/include/inet inet
        -ln -s /usr/include/ufs ufs
+       -ln -s $(TOP_SRCDIR)/afsd afsd
        -ln -s $(NS_INCL) nsapi
 
 setup_uafs: UAFS setup_common
@@ -1424,23 +1594,23 @@ setup_nsafs: AFSWEB setup_common
        ln -s ../Makefile.common AFSWEB/Makefile.common
 
 UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=; \
+       cd UAFS && \
+       $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
        $(RANLIB) $(LIBUAFS)
 
 JUAFS/$(LIBJUAFS): setup_juafs
-       cd JUAFS; \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS; \
+       cd JUAFS && \
+       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS && \
        $(RANLIB) $(LIBJUAFS)
 
 AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}; \
+       cd AFSWEB && \
+       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR} && \
        $(RANLIB) $(LIBAFSWEB)
 
 AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}; \
+       cd AFSWEB && \
+       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR} && \
        $(RANLIB) $(LIBAFSWEBKRB)
 
 include ${TOP_OBJDIR}/src/config/Makefile.version
OpenAFS Master Repository