From bd5c12995e6de74d36bd2205f7268a0f32029b7f Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Fri, 19 Sep 2014 21:18:38 -0400 Subject: [PATCH] Deorbit separate JUAFS build Since 80943970b8cfcdf3fc630b25804aebaea228bd73, when the web enhancements were enabled universally, there has no longer been a functional difference between the UAFS and JUAFS builds. Their object files are compiled using the same compilation rule, and the list of object files differed only by rx_kmutex.o (which is devoid of content) and xdr_int32.o (which is preumably an oversight). Save the extra build time by just reinstalling libuafs.a as libjuafs.a to preserve the existing interfaces. Additionally, drop the LIBJUAFS make variable -- all definitions set it to libjuafs.a. Similarly, the LIBJUAFS_FLAGS variable was unused and can be removed. Change-Id: I2074d5bc26e326db36b16e055431818ef1c69210 Reviewed-on: http://gerrit.openafs.org/11471 Reviewed-by: D Brashear Tested-by: D Brashear --- src/libuafs/.gitignore | 1 - src/libuafs/Makefile.common.in | 408 +-------------------------- src/libuafs/MakefileProto.AIX.in | 6 - src/libuafs/MakefileProto.DARWIN.in | 5 - src/libuafs/MakefileProto.DFBSD.in | 5 - src/libuafs/MakefileProto.DUX.in | 6 - src/libuafs/MakefileProto.FBSD.in | 5 - src/libuafs/MakefileProto.HPUX.in | 5 - src/libuafs/MakefileProto.IRIX.in | 5 - src/libuafs/MakefileProto.LINUX.in | 9 - src/libuafs/MakefileProto.NBSD.in | 5 - src/libuafs/MakefileProto.OBSD.in | 5 - src/libuafs/MakefileProto.SOLARIS.in | 5 - src/libuafs/README | 53 +--- 14 files changed, 25 insertions(+), 498 deletions(-) diff --git a/src/libuafs/.gitignore b/src/libuafs/.gitignore index 33b428146..7d9e93b30 100644 --- a/src/libuafs/.gitignore +++ b/src/libuafs/.gitignore @@ -8,7 +8,6 @@ /PERLUAFS /UAFS /UAFS.pic -/JUAFS /afs /afsd /afsint diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index 6524039d2..ba89ede60 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -12,7 +12,6 @@ SHELL=/bin/sh INCLUDE= -I. -I${ISYSROOT}/usr/include -I${TOP_OBJDIR}/src/config UOBJ =../UAFS PICOBJ =../UAFS.pic -JUAFS =../JUAFS PERLUAFS = PERLUAFS AFS =../afs RX =../rx @@ -60,7 +59,7 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \ # Build rules - CC and CFLAGS are defined in system specific MakefileProtos. -all: ${TOP_LIBDIR}/$(LIBJUAFS) ${TOP_LIBDIR}/$(LIBUAFS) \ +all: ${TOP_LIBDIR}/libjuafs.a ${TOP_LIBDIR}/$(LIBUAFS) \ ${TOP_LIBDIR}/libuafs_pic.a linktest @LIBUAFS_BUILD_PERL@ ${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS) @@ -69,7 +68,7 @@ ${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libuafs_pic.a: UAFS.pic/libuafs_pic.a ${INSTALL_DATA} $? $@ -${TOP_LIBDIR}/$(LIBJUAFS): JUAFS/$(LIBJUAFS) +${TOP_LIBDIR}/libjuafs.a: UAFS/$(LIBUAFS) ${INSTALL_DATA} $? $@ setup_perllib: @@ -92,8 +91,8 @@ linktest: UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libafsutil.a $(TOP_LIBDIR)/libopr.a \ $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS) -CRULE1= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? -CRULEPIC=$(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $? +CRULE1= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(CFLAGS) -c $? +CRULEPIC=$(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(CFLAGS) $(SHLIB_CFLAGS) -c $? UAFSOBJ = \ $(UOBJ)/afs_atomlist.o \ @@ -341,127 +340,6 @@ PICUAFSOBJ = \ $(PICOBJ)/xdr_mem.o \ $(PICOBJ)/xdr_len.o -JUAFSOBJ = \ - $(JUAFS)/afs_atomlist.o \ - $(JUAFS)/afs_lhash.o \ - $(JUAFS)/afs_analyze.o \ - $(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 \ - $(JUAFS)/afs_chunk.o \ - $(JUAFS)/afs_conn.o \ - $(JUAFS)/afs_daemons.o \ - $(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_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 \ - $(JUAFS)/afs_vnop_create.o \ - $(JUAFS)/afs_vnop_dirops.o \ - $(JUAFS)/afs_vnop_fid.o \ - $(JUAFS)/afs_vnop_flock.o \ - $(JUAFS)/afs_vnop_link.o \ - $(JUAFS)/afs_vnop_lookup.o \ - $(JUAFS)/afs_vnop_open.o \ - $(JUAFS)/afs_vnop_read.o \ - $(JUAFS)/afs_vnop_readdir.o \ - $(JUAFS)/afs_vnop_remove.o \ - $(JUAFS)/afs_vnop_rename.o \ - $(JUAFS)/afs_vnop_strategy.o \ - $(JUAFS)/afs_vnop_symlink.o \ - $(JUAFS)/afs_vnop_write.o \ - $(JUAFS)/afs_volume.o \ - $(JUAFS)/afs_call.o \ - $(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)/xdr_update.o \ - $(JUAFS)/xdr_refernce.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_array.o \ - $(JUAFS)/xdr_arrayn.o \ - $(JUAFS)/Kvice.cs.o \ - $(JUAFS)/fcrypt.o \ - $(JUAFS)/rx.o \ - $(JUAFS)/rx_rdwr.o \ - $(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)/rx_call.o \ - $(JUAFS)/rx_conn.o \ - $(JUAFS)/rx_peer.o \ - $(JUAFS)/xdr_rx.o \ - $(JUAFS)/Kvldbint.cs.o \ - $(JUAFS)/Kvldbint.xdr.o \ - $(JUAFS)/Kcallback.ss.o \ - $(JUAFS)/crypt_conn.o \ - $(JUAFS)/AFS_component_version_number.o \ - $(JUAFS)/afs_exporter.o \ - $(JUAFS)/rxkad_client.o \ - $(JUAFS)/rxkad_common.o \ - $(JUAFS)/casestrcpy.o \ - $(JUAFS)/dirpath.o \ - $(JUAFS)/fileutil.o \ - $(JUAFS)/netrestrict.o \ - $(JUAFS)/cellconfig.o \ - $(JUAFS)/keys.o \ - $(JUAFS)/realms.o \ - $(JUAFS)/ktc.o \ - $(JUAFS)/Krxstat.ss.o \ - $(JUAFS)/Krxstat.xdr.o \ - $(JUAFS)/rxstat.o \ - $(JUAFS)/xdr_int64.o \ - $(JUAFS)/token.xdr.o \ - $(JUAFS)/token.o \ - $(JUAFS)/xdr_mem.o \ - $(JUAFS)/xdr_len.o - # Compilation rules # These files are for the user space library @@ -966,256 +844,6 @@ $(PICOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c $(PICOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c $(CRULEPIC) -# 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 - $(CRULE1) -$(JUAFS)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c - $(CRULE1) -$(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 - $(CRULE1) -$(JUAFS)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c - $(CRULE1) -$(JUAFS)/afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c - $(CRULE1) -$(JUAFS)/afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c - $(CRULE1) -$(JUAFS)/afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c - $(CRULE1) -$(JUAFS)/afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c - $(CRULE1) -$(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 - $(CRULE1) -$(JUAFS)/afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c - $(CRULE1) -$(JUAFS)/afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c - $(CRULE1) -$(JUAFS)/afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c - $(CRULE1) -$(JUAFS)/afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c - $(CRULE1) -$(JUAFS)/afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c - $(CRULE1) -$(JUAFS)/afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c - $(CRULE1) -$(JUAFS)/afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c - $(CRULE1) -$(JUAFS)/afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c - $(CRULE1) -$(JUAFS)/afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c - $(CRULE1) -$(JUAFS)/afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c - $(CRULE1) -$(JUAFS)/afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c - $(CRULE1) -$(JUAFS)/afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c - $(CRULE1) -$(JUAFS)/afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c - $(CRULE1) -$(JUAFS)/afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c - $(CRULE1) -$(JUAFS)/afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c - $(CRULE1) -$(JUAFS)/afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c - $(CRULE1) -$(JUAFS)/rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c - $(CRULE1) -$(JUAFS)/afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c - $(CRULE1) -$(JUAFS)/afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c - $(CRULE1) -$(JUAFS)/afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c - $(CRULE1) -$(JUAFS)/afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c - $(CRULE1) -$(JUAFS)/afs_dir.o: $(TOP_SRCDIR)/dir/dir.c - $(CRULE1) -o afs_dir.o -$(JUAFS)/AFS_component_version_number.o: AFS_component_version_number.c - $(CRULE1) -$(JUAFS)/afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c - $(CRULE1) -$(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)/fcrypt.c - $(CRULE1) -$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c - $(CRULE1) -$(JUAFS)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c - $(CRULE1) -$(JUAFS)/rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c - $(CRULE1) -$(JUAFS)/afs_exporter.o: $(TOP_SRCDIR)/afs/afs_exporter.c - $(CRULE1) -$(JUAFS)/afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c - $(CRULE1) -$(JUAFS)/afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c - $(CRULE1) -$(JUAFS)/rx.o: $(TOP_SRC_RX)/rx.c - $(CRULE1) -$(JUAFS)/rx_clock.o: $(TOP_SRC_RX)/rx_clock.c - $(CRULE1) -$(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 - $(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_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)/opr/assert.c - $(CRULE1) -$(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c - $(CRULE1) -$(JUAFS)/xdr_update.o: $(TOP_SRCDIR)/rx/xdr_update.c - $(CRULE1) -$(JUAFS)/xdr_refernce.o: $(TOP_SRCDIR)/rx/xdr_refernce.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 - $(CRULE1) -$(JUAFS)/Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c - $(CRULE1) -$(JUAFS)/afsaux.o: $(TOP_SRC_FSINT)/afsaux.c - $(CRULE1) -$(JUAFS)/xdr_array.o: $(TOP_SRC_RX)/xdr_array.c - $(CRULE1) -$(JUAFS)/xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c - $(CRULE1) -$(JUAFS)/Kvldbint.cs.o: $(TOP_OBJ_VLSERVER)/Kvldbint.cs.c - $(CRULE1) -$(JUAFS)/Kvldbint.xdr.o: $(TOP_OBJ_VLSERVER)/Kvldbint.xdr.c - $(CRULE1) -$(JUAFS)/rx_knet.o: $(TOP_SRC_RX)/UKERNEL/rx_knet.c - $(CRULE1) -$(JUAFS)/rx_kcommon.o: $(TOP_SRCDIR)/rx/rx_kcommon.c - $(CRULE1) -$(JUAFS)/afs_call.o: $(TOP_SRC_AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS -$(JUAFS)/afs_icl.o: $(TOP_SRC_AFS)/afs_icl.c - $(CRULE1) -DAFS_NONFSTRANS -$(JUAFS)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS -$(JUAFS)/afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c - $(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) @CFLAGS_NOERROR@ -$(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c - $(CRULE1) -$(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c - $(CRULE1) -$(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)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c - $(CRULE1) -$(JUAFS)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c - $(CRULE1) -$(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) - $(PERLUAFS)/ukernel.pm: $(PERLUAFS)/ukernel_swig_perl.c $(PERLUAFS)/ukernel_swig_perl.c: ${srcdir}/ukernel_swig.i mkdir -p $(PERLUAFS) @@ -1238,15 +866,14 @@ $(PERLUAFS)/ukernel.so: $(PERLUAFS)/ukernel_swig_perl.o UAFS.pic/libuafs_pic.a $(XLIBS) clean: - -$(RM) -rf UAFS* JUAFS* PERLUAFS afsd afs afsint config rx + -$(RM) -rf UAFS* PERLUAFS afsd afs afsint config rx -$(RM) -rf h -$(RM) -f linktest $(AFS_OS_CLEAN) -install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS) UAFS.pic/libuafs_pic.a \ - @LIBUAFS_BUILD_PERL@ +install: UAFS/$(LIBUAFS) UAFS.pic/libuafs_pic.a @LIBUAFS_BUILD_PERL@ ${INSTALL} -d ${DESTDIR}${libdir} ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DESTDIR}${libdir}/$(LIBUAFS) - ${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DESTDIR}${libdir}/$(LIBJUAFS) + ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DESTDIR}${libdir}/libjuafs.a ${INSTALL_DATA} UAFS.pic/libuafs_pic.a ${DESTDIR}${libdir}/libuafs_pic.a if [ "x$(LIBUAFS_BUILD_PERL)" != "x" ] ; then \ ${INSTALL} -d ${DESTDIR}${libdir}/perl; \ @@ -1260,7 +887,7 @@ dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \ $(TOP_INCDIR)/afs/afs_stats.h \ $(TOP_SRCDIR)/afs/sysincludes.h \ $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \ - UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS) UAFS.pic/libuafs_pic.a \ + UAFS/$(LIBUAFS) UAFS.pic/libuafs_pic.a \ @LIBUAFS_BUILD_PERL@ ${INSTALL} -d ${DEST}/root.perf/include/afs ${INSTALL} -d ${DEST}/root.perf/lib @@ -1277,7 +904,7 @@ dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \ ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \ ${DEST}/root.perf/include/afs/afs_usrops.h ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DEST}/root.perf/lib/$(LIBUAFS) - ${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DEST}/root.perf/lib/$(LIBJUAFS) + ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DEST}/root.perf/lib/libjuafs.a ${INSTALL_DATA} UAFS.pic/libuafs_pic.a ${DEST}/root.perf/lib/libuafs_pic.a if [ "x$(LIBUAFS_BUILD_PERL)" != "x" ] ; then \ ${INSTALL} -d ${DEST}/root.perf/lib/perl; \ @@ -1295,9 +922,6 @@ UAFS: UAFS.pic: mkdir -p $@ -JUAFS: - mkdir -p $@ - h: $(TOP_SRC_AFS)/*.c $(TOP_SRC_VNOPS)/*.c $(TOP_SRC_RX)/*.c -$(RM) -rf h @TOP_SRCDIR@/libuafs/make_h_tree $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \ @@ -1317,24 +941,14 @@ setup_picuafs: UAFS.pic setup_common ln -s ../Makefile UAFS.pic/Makefile ln -s ../Makefile.common UAFS.pic/Makefile.common -setup_juafs: JUAFS setup_common - -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common - ln -s ../Makefile JUAFS/Makefile - ln -s ../Makefile.common JUAFS/Makefile.common - UAFS/$(LIBUAFS): setup_uafs cd UAFS && \ - $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \ + $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} && \ $(RANLIB) $(LIBUAFS) UAFS.pic/libuafs_pic.a: setup_picuafs cd UAFS.pic && \ - $(MAKE) libuafs_pic.a DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \ + $(MAKE) libuafs_pic.a DESTDIR=${DESTDIR} && \ $(RANLIB) libuafs_pic.a -JUAFS/$(LIBJUAFS): setup_juafs - cd JUAFS && \ - $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \ - $(RANLIB) $(LIBJUAFS) - include ${TOP_OBJDIR}/src/config/Makefile.version diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index 273df8de0..30e1cd912 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -28,7 +28,6 @@ TEST_LDFLAGS= TEST_LIBS=-lm -lpthreads LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a AFS_OS_CLEAN = \ *.exp \ @@ -49,8 +48,3 @@ libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) $(AFS)/afsl.exp $(RANLIB) libuafs_pic.a - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) $(AFS)/afsl.exp - $(RANLIB) libjuafs.a diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index e45a08c45..867ceceed 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -24,7 +24,6 @@ TEST_LDFLAGS=$(XLDFLAGS) $(ARCHFLAGS) TEST_LIBS= LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -35,7 +34,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.DFBSD.in b/src/libuafs/MakefileProto.DFBSD.in index cb75407b6..77e0b24ed 100644 --- a/src/libuafs/MakefileProto.DFBSD.in +++ b/src/libuafs/MakefileProto.DFBSD.in @@ -25,7 +25,6 @@ TEST_LIBS=-lpthread LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -36,7 +35,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index d9ac00266..4be24f4e0 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -23,7 +23,6 @@ TEST_LDFLAGS=-pthread TEST_LIBS=-lm LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -36,8 +35,3 @@ libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) ranlib libuafs_pic.a - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) - ranlib $(LIBJUAFS) diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index 5b73baee8..22e49371c 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -25,7 +25,6 @@ TEST_LDFLAGS= TEST_LIBS=-lpthread LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -36,7 +35,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 49a104eea..0428c86eb 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -32,7 +32,6 @@ TEST_LDFLAGS= TEST_LIBS=-lnsl -lm -lpthread -ldld -lc LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -43,7 +42,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index 0cbd8903e..4d1d9465d 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -23,7 +23,6 @@ TEST_LDFLAGS=-ignore_minor TEST_LIBS=-lpthread -lm LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -34,7 +33,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 94a1632a7..75b249469 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -13,10 +13,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ # MakefileProto for LINUX systems -# This Makefile generates two libraries: the standard libuafs and libjuafs, -# a libuafs variant that is designed to link with Java enabled libraries. -# The libjuafs library implements the AFS_WEB_ENHANCEMENTS definition, see -# the libuafs README for details. # System specific build commands and flags DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL @@ -35,7 +31,6 @@ TEST_LDFLAGS= TEST_LIBS=-lpthread @LIB_crypt@ LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -46,7 +41,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.NBSD.in b/src/libuafs/MakefileProto.NBSD.in index 61c3ca635..db7fddc21 100644 --- a/src/libuafs/MakefileProto.NBSD.in +++ b/src/libuafs/MakefileProto.NBSD.in @@ -25,7 +25,6 @@ TEST_LDFLAGS= TEST_LIBS= LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -36,7 +35,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.OBSD.in b/src/libuafs/MakefileProto.OBSD.in index c4079b5fc..f3f8560e6 100644 --- a/src/libuafs/MakefileProto.OBSD.in +++ b/src/libuafs/MakefileProto.OBSD.in @@ -25,7 +25,6 @@ TEST_LDFLAGS= TEST_LIBS= LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -36,7 +35,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index 74d82dbce..d0c506411 100644 --- a/src/libuafs/MakefileProto.SOLARIS.in +++ b/src/libuafs/MakefileProto.SOLARIS.in @@ -22,7 +22,6 @@ TEST_LDFLAGS= TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl LIBUAFS = libuafs.a -LIBJUAFS = libjuafs.a include Makefile.common @@ -33,7 +32,3 @@ $(LIBUAFS): $(UAFSOBJ) libuafs_pic.a: $(PICUAFSOBJ) -$(RM) -f libuafs_pic.a $(AR) $(ARFLAGS) libuafs_pic.a $(PICUAFSOBJ) - -$(LIBJUAFS): $(JUAFSOBJ) - -$(RM) -f $(LIBJUAFS) - $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) diff --git a/src/libuafs/README b/src/libuafs/README index a62281ca6..051b17d2c 100644 --- a/src/libuafs/README +++ b/src/libuafs/README @@ -11,14 +11,17 @@ README file for libuafs and libjuafs, Version 1.2 06/04/2003. ### INTRODUCTION ### This Makefile generates two libraries, the standard libuafs.a and -libjuafs.a, a libuafs.a variant that is designed for use with Java -enabled applications (as used with libjafsadm, see -src/JAVA/libjafsadm/JAFSADM_README). The libuafs.a library facilitates -user authentication at a process level and enables access and -manipulation of the files and access control lists (ACLs). By way of -the libuafs.a klog function (uafs_klog), the authenticated user's -credentials are bound to the executing process and therefore is granted -permission to act on behalf of the authenticated user. +libuafs_pic.a, suitable for linking into shared libraries. +It installs libuafs.a as both itself and libjuafs.a, for use with +Java-enabled applications which expect that name, for historical +compatibility (see src/JAVA/libjafsadm/JAFSADM_README). + +The libuafs.a library facilitates user authentication at a process +level and enables access and manipulation of the files and access +control lists (ACLs). By way of the libuafs.a klog function +(uafs_klog), the authenticated user's credentials are bound to the +executing process and therefore is granted permission to act on behalf +of the authenticated user. ### LIBUAFS ### @@ -27,27 +30,6 @@ As of 05/13/2002 the libuafs.a library remains unchanged with respect to OpenAFS release 1.2.3. -### LIBJUAFS ### - -The libjuafs.a is a new addition to the libuafs.a build as of 05/10/2002 and has -been added for the following reasons: - -- To avoid function name collisions with other libraries -- To ensure that existing applications using libuafs.a will not be affected. -- Utilize libuafs.a functionality in Java-based applications. - -The libjuafs.a library implements the AFS_WEB_ENHANCEMENTS and UKERNEL -(user space kernel) definitions, which are used to enable functions -such as: - -- afs_setpag_val* -- uafs_klog_nopag -- uafs_getcellstatus -- uafs_getvolquota -- uafs_setvolquota -- uafs_statmountpoint -- uafs_getRights - *afs_setpag_val A function like setpag but sets the current thread's pag id to a caller-provided value instead of calling genpag(). This implements a @@ -57,22 +39,15 @@ for the thread to restore tokens, rather than reauthenticating. ### BUILD ### -A simple "make" will build both libuafs.a and libjuafs.a. Optionally, you -can make each library independently by issuing: - - make UAFS/libuafs.a - - - and - - - make JUAFS/libjuafs.a +A simple "make" will build libuafs.a and libuafs_pic.a. ### DIRECTORIES ### The libuafs/UAFS directory is generated by the Makefile and contains the object files and local copy of libuafs.a resulting from the build process. -The libuafs/JUAFS directory is the same as libuafs/UAFS, however it -contains output files respective to libjuafs.a. +The libuafs/UAFS.pic directory is the same as libuafs/UAFS, however it +contains output files respective to libuafs_pic.a. ### CONSIDERATIONS ### -- 2.39.5