$(LDFLAGS_roken) $(LDFLAGS_hcrypto) -o linktest \
${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL \
UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a \
- ${TOP_LIBDIR}/libafsutil.a \
+ ${TOP_LIBDIR}/libafsutil.a $(TOP_LIBDIR)/libopr.a \
$(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS)
CRULE1= $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
$(UOBJ)/rx_stats.o \
$(UOBJ)/rx_packet.o \
$(UOBJ)/rx_conncache.o \
+ $(UOBJ)/rx_call.o \
+ $(UOBJ)/rx_conn.o \
+ $(UOBJ)/rx_peer.o \
$(UOBJ)/xdr_rx.o \
$(UOBJ)/Kvldbint.cs.o \
$(UOBJ)/Kvldbint.xdr.o \
$(UOBJ)/casestrcpy.o \
$(UOBJ)/dirpath.o \
$(UOBJ)/fileutil.o \
- $(UOBJ)/netutils.o \
+ $(UOBJ)/netrestrict.o \
$(UOBJ)/et_name.o \
$(UOBJ)/com_err.o \
$(UOBJ)/error_msg.o \
$(UOBJ)/authcon.o \
$(UOBJ)/cellconfig.o \
$(UOBJ)/keys.o \
+ $(UOBJ)/realms.o \
$(UOBJ)/client.o \
$(UOBJ)/acfg_errors.o \
$(UOBJ)/kaaux.o \
$(PICOBJ)/rx_stats.o \
$(PICOBJ)/rx_packet.o \
$(PICOBJ)/rx_conncache.o \
+ $(PICOBJ)/rx_call.o \
+ $(PICOBJ)/rx_conn.o \
+ $(PICOBJ)/rx_peer.o \
$(PICOBJ)/xdr_rx.o \
$(PICOBJ)/Kvldbint.cs.o \
$(PICOBJ)/Kvldbint.xdr.o \
$(PICOBJ)/casestrcpy.o \
$(PICOBJ)/dirpath.o \
$(PICOBJ)/fileutil.o \
- $(PICOBJ)/netutils.o \
+ $(PICOBJ)/netrestrict.o \
$(PICOBJ)/et_name.o \
$(PICOBJ)/com_err.o \
$(PICOBJ)/error_msg.o \
$(PICOBJ)/authcon.o \
$(PICOBJ)/cellconfig.o \
$(PICOBJ)/keys.o \
+ $(PICOBJ)/realms.o \
$(PICOBJ)/client.o \
$(PICOBJ)/acfg_errors.o \
$(PICOBJ)/kaaux.o \
$(WEBOBJ)/rx_stats.o \
$(WEBOBJ)/rx_packet.o \
$(WEBOBJ)/rx_conncache.o \
+ $(WEBOBJ)/rx_call.o \
+ $(WEBOBJ)/rx_conn.o \
+ $(WEBOBJ)/rx_peer.o \
$(WEBOBJ)/xdr_rx.o \
$(WEBOBJ)/Kvldbint.cs.o \
$(WEBOBJ)/Kvldbint.xdr.o \
$(WEBOBJ)/casestrcpy.o \
$(WEBOBJ)/dirpath.o \
$(WEBOBJ)/fileutil.o \
- $(WEBOBJ)/netutils.o \
+ $(WEBOBJ)/netrestrict.o \
$(WEBOBJ)/et_name.o \
$(WEBOBJ)/com_err.o \
$(WEBOBJ)/error_msg.o \
$(WEBOBJ)/cellconfig.o \
$(WEBOBJ)/client.o \
$(WEBOBJ)/keys.o \
+ $(WEBOBJ)/realms.o \
$(WEBOBJ)/acfg_errors.o \
$(WEBOBJ)/kaaux.o \
$(WEBOBJ)/kalocalcell.o \
$(WEBOBJ)/rx_stats.o \
$(WEBOBJ)/rx_packet.o \
$(WEBOBJ)/rx_conncache.o \
+ $(WEBOBJ)/rx_call.o \
+ $(WEBOBJ)/rx_conn.o \
+ $(WEBOBJ)/rx_peer.o \
$(WEBOBJ)/xdr_rx.o \
$(WEBOBJ)/Kvldbint.cs.o \
$(WEBOBJ)/Kvldbint.xdr.o \
$(WEBOBJ)/casestrcpy.o \
$(WEBOBJ)/dirpath.o \
$(WEBOBJ)/fileutil.o \
- $(WEBOBJ)/netutils.o \
+ $(WEBOBJ)/netrestrict.o \
$(WEBOBJ)/et_name.o \
$(WEBOBJ)/com_err.o \
$(WEBOBJ)/error_msg.o \
$(WEBOBJ)/cellconfig.o \
$(WEBOBJ)/client.o \
$(WEBOBJ)/keys.o \
+ $(WEBOBJ)/realms.o \
$(WEBOBJ)/acfg_errors.o \
$(WEBOBJ)/kaaux.o \
$(WEBOBJ)/kalocalcell.o \
$(JUAFS)/rx_stats.o \
$(JUAFS)/rx_packet.o \
$(JUAFS)/rx_conncache.o \
+ $(JUAFS)/rx_call.o \
+ $(JUAFS)/rx_conn.o \
+ $(JUAFS)/rx_peer.o \
$(JUAFS)/xdr_rx.o \
$(JUAFS)/Kvldbint.cs.o \
$(JUAFS)/Kvldbint.xdr.o \
$(JUAFS)/casestrcpy.o \
$(JUAFS)/dirpath.o \
$(JUAFS)/fileutil.o \
- $(JUAFS)/netutils.o \
+ $(JUAFS)/netrestrict.o \
$(JUAFS)/et_name.o \
$(JUAFS)/com_err.o \
$(JUAFS)/error_msg.o \
$(JUAFS)/authcon.o \
$(JUAFS)/cellconfig.o \
$(JUAFS)/keys.o \
+ $(JUAFS)/realms.o \
$(JUAFS)/client.o \
$(JUAFS)/acfg_errors.o \
$(JUAFS)/kaaux.o \
$(CRULE1)
$(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE1)
+$(UOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+ $(CRULE1)
+$(UOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+ $(CRULE1)
+$(UOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+ $(CRULE1)
$(UOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULE1)
$(UOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
$(CRULE1)
$(UOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE1) -o afs_uuid.o
-$(UOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(UOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(UOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE1)
$(CRULE1)
$(UOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
$(CRULE1)
-$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
+ $(CRULE1)
+$(UOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
$(CRULE1)
$(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(UOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
-$(UOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+$(UOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(UOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE1)
$(CRULEPIC)
$(PICOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULEPIC)
+$(PICOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+ $(CRULEPIC)
+$(PICOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+ $(CRULEPIC)
+$(PICOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+ $(CRULEPIC)
$(PICOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULEPIC)
$(PICOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
$(CRULEPIC)
$(PICOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULEPIC) -o afs_uuid.o
-$(PICOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(PICOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULEPIC)
$(PICOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULEPIC)
$(CRULEPIC)
$(PICOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
$(CRULEPIC)
-$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
+ $(CRULEPIC)
+$(PICOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
$(CRULEPIC)
$(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULEPIC)
$(PICOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULEPIC)
-$(PICOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+$(PICOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULEPIC)
$(PICOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULEPIC)
$(CRULE2)
$(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE2)
+$(WEBOBJ)/rx_call.o: $(TOP_SRCDIR)/rx_rx_call.c
+ $(CRULE2)
+$(WEBOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+ $(CRULE2)
+$(WEBOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+ $(CRULE2)
$(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULE2)
$(WEBOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
$(CRULE2)
$(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE2) -o afs_uuid.o
-$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE2)
$(CRULE2)
$(WEBOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
$(CRULE2)
-$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
$(CRULE1)
+$(WEBOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
+ $(CRULE2)
$(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(WEBOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
-$(WEBOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+$(WEBOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(WEBOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE2)
$(CRULE1)
$(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
$(CRULE1)
+$(JUAFS)/rx_call.o: $(TOP_SRC_RX)/rx_call.c
+ $(CRULE1)
+$(JUAFS)/rx_conn.o: $(TOP_SRC_RX)/rx_conn.c
+ $(CRULE1)
+$(JUAFS)/rx_peer.o: $(TOP_SRC_RX)/rx_peer.c
+ $(CRULE1)
$(JUAFS)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
$(CRULE1)
$(JUAFS)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
$(CRULE1)
$(JUAFS)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
$(CRULE1) -o afs_uuid.o
-$(JUAFS)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(JUAFS)/assert.o: $(TOP_SRCDIR)/opr/assert.c
$(CRULE1)
$(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE1)
$(CRULE1)
$(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c
$(CRULE1)
-$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
+ $(CRULE1)
+$(JUAFS)/realms.o: $(TOP_SRCDIR)/auth/realms.c
$(CRULE1)
$(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
$(CRULE1)
$(JUAFS)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
$(CRULE1)
-$(JUAFS)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+$(JUAFS)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
$(CRULE1)
$(JUAFS)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
$(CRULE1)
$(SWIG_PERL_LDFLAGS) $(LDFLAGS) \
$(PERLUAFS)/ukernel_swig_perl.o \
UAFS.pic/libuafs_pic.a ${TOP_LIBDIR}/libcmd_pic.a \
- ${TOP_LIBDIR}/libafsutil_pic.a $(LDFLAGS_roken) \
- $(LDFLAGS_hcrypto) $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) \
+ ${TOP_LIBDIR}/libafsutil_pic.a \
+ $(TOP_LIBDIR)/libopr_pic.a \
+ $(LDFLAGS_roken) $(LDFLAGS_hcrypto) $(LIB_hcrypto) \
+ $(LIB_roken) $(LIB_crypt) \
$(XLIBS)
clean:
-$(RM) -rf UAFS* JUAFS* AFSWEB* PERLUAFS nsapi afsd afs afsint config rx
-$(RM) -rf h
- -$(RM) linktest $(AFS_OS_CLEAN)
+ -$(RM) -f linktest $(AFS_OS_CLEAN)
install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS) UAFS.pic/libuafs_pic.a \
@LIBUAFS_BUILD_PERL@
${DEST}/root.perf/include/afs/afs_sysnames.h
${INSTALL_DATA} $(TOP_INCDIR)/afs/afs_stats.h \
${DEST}/root.perf/include/afs/afs_stats.h
- ${INSTALL_DATA} $(TOP_SRCDIR)/afs/sysincludes.h \
+ ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/sysincludes.h \
${DEST}/root.perf/include/afs/sysincludes.h
${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
${DEST}/root.perf/include/afs/afs_usrops.h
AFSWEB:
mkdir -p $@
-setup_common:
- -$(RM) -f nsapi afsd
+h: $(TOP_SRC_AFS)/*.c $(TOP_SRC_VNOPS)/*.c $(TOP_SRC_RX)/*.c
-$(RM) -rf h
- @TOP_SRCDIR@/libuafs/make_h_tree.pl $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
+ @TOP_SRCDIR@/libuafs/make_h_tree $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
$(TOP_SRC_RX)
+
+setup_common: h
+ -$(RM) -f nsapi afsd
-ln -s $(TOP_SRCDIR)/afsd afsd
-ln -s $(NS_INCL) nsapi
JUAFS/$(LIBJUAFS): setup_juafs
cd JUAFS && \
- $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS && \
+ $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
$(RANLIB) $(LIBJUAFS)
AFSWEB/$(LIBAFSWEB): setup_nsafs