jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

util: Convert to using libtool

Browse Source 
Create a pthreaded version of libafsutil, named liboafs_util.la,
and use this library in all of the pthreaded binaries that we build,
replacing both inclusion of libafsutil.a, and direct compliation of
pthreaded versions of the util source files.

libafsutil.a is provided for legacy LWP applications, and the
convenience library libafsutil_pic.a remains until we address the way
in which the user space cache manager is built and linked.

Change-Id: Ibdc3d6e2fe56ca6f5b882cf03991d1a2e32c62b2
Reviewed-on: http://gerrit.openafs.org/8056
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Simon Wilkinson 2012-05-24 09:14:18 +01:00 committed by Derrick Brashear
parent 772e957b71
commit 012b878576
24 changed files with 134 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -152,7 +152,7 @@ procmgmt: $(DIR_roken) config
opr: config hcrypto $(DIR_roken)
+${COMPILE_PART1} opr ${COMPILE_PART2}
util: opr $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
util: opr $(DIR_roken) procmgmt hcrypto lwp
+${COMPILE_PART1} util ${COMPILE_PART2}
libafscp: util afs volser vlserver rx auth fsint

5
src/afsd/Makefile.in
View File

@ -23,15 +23,14 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libsys.a \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/opr/liboafs_opr.la
UAFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libuafs.a \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la
FUSE_LIBS=@FUSE_LIBS@

2
src/aklog/Makefile.in
View File

@ -15,7 +15,7 @@ AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafshcrypto.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/util.a
$(top_builddir)/src/util/liboafs_util.la
SRCS= aklog.c krb_util.c linked_list.c
OBJS= aklog.o krb_util.o linked_list.o

15
src/cf/osconf.m4
View File

@ -292,8 +292,7 @@ case $AFS_SYSNAME in
KROOT=
KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
LWP_OPTMZ="-O2"
REGEX_OBJ="regex.o"
REGEX_OBJ_PIC="regex_pic.o"
REGEX_OBJ="regex.lo"
XCFLAGS="-no-cpp-precomp"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
@ -310,8 +309,7 @@ case $AFS_SYSNAME in
KERN_OPTMZ="-Os"
LWP_OPTMZ="-Os"
OPTMZ="-Os"
REGEX_OBJ="regex.o"
REGEX_OBJ_PIC="regex_pic.o"
REGEX_OBJ="regex.lo"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
@ -328,8 +326,7 @@ case $AFS_SYSNAME in
KERN_OPTMZ="-Os"
LWP_OPTMZ="-Os"
OPTMZ="-Os"
REGEX_OBJ="regex.o"
REGEX_OBJ_PIC="regex_pic.o"
REGEX_OBJ="regex.lo"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
@ -348,7 +345,7 @@ case $AFS_SYSNAME in
LWP_OPTMZ="-Os"
OPTMZ="-Os"
PAM_LIBS="-lpam"
REGEX_OBJ="regex.o"
REGEX_OBJ="regex.lo"
TXLIBS="-lncurses"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} -dynamiclib"
@ -368,8 +365,7 @@ case $AFS_SYSNAME in
LWP_OPTMZ="-Os"
OPTMZ="-Os"
PAM_LIBS="-lpam"
REGEX_OBJ="regex.o"
REGEX_OBJ_PIC="regex_pic.o"
REGEX_OBJ="regex.lo"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${CC} \${ARCHFLAGS} -dynamiclib"
SHLIB_SUFFIX="dylib"
@ -767,7 +763,6 @@ AC_SUBST(PAM_DBG)
AC_SUBST(PAM_OPTMZ)
AC_SUBST(RANLIB)
AC_SUBST(REGEX_OBJ)
AC_SUBST(REGEX_OBJ_PIC)
AC_SUBST(RM)
AC_SUBST(RXDEBUG)
AC_SUBST(SHLIB_CFLAGS)

39
src/dviced/Makefile.in
View File

@ -20,7 +20,6 @@ VICED=$(srcdir)/../viced
VLSERVER=$(srcdir)/../vlserver
LWP=$(srcdir)/../lwp
LIBACL=$(srcdir)/../libacl
UTIL=$(srcdir)/../util
DIR=$(srcdir)/../dir
VOL=$(srcdir)/../vol
FSINT=$(srcdir)/../fsint
@ -34,29 +33,28 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
fstab.o salvsync-client.o daemon_com.o vg_cache.o vg_scan.o
salvsync-client.o daemon_com.o vg_cache.o vg_scan.o
FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
RXOBJS = rx_pthread.o
objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a \
SDBGOBJS = state_analyzer.o \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la
LIBS=${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/util.a
$(top_builddir)/src/util/liboafs_util.la
all: dafileserver state_analyzer
@ -85,27 +83,6 @@ fsstats.o: ${VICED}/fsstats.c
serialize_state.o: ${VICED}/serialize_state.c
$(AFS_CCRULE) $(VICED)/serialize_state.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
lock.o: ${LWP}/lock.c
$(AFS_CCRULE) $(LWP)/lock.c
@ -173,10 +150,6 @@ nuke.o: ${VOL}/nuke.c
devname.o: ${VOL}/devname.c
$(AFS_CCRULE) $(VOL)/devname.c
# only for darwin?
fstab.o: ${UTIL}/fstab.c
$(AFS_CCRULE) $(UTIL)/fstab.c
common.o: ${VOL}/common.c
$(AFS_CCRULE) $(VOL)/common.c
@ -223,7 +196,7 @@ install: dafileserver state_analyzer
${INSTALL} -d ${DESTDIR}${afssrvsbindir}
$(LT_INSTALL_PROGRAM) dafileserver \
${DESTDIR}${afssrvlibexecdir}/dafileserver
${INSTALL_PROGRAM} state_analyzer \
${LT_INSTALL_PROGRAM} state_analyzer \
${DESTDIR}${afssrvsbindir}/state_analyzer
dest: dafileserver state_analyzer

28
src/dvolser/Makefile.in
View File

@ -16,7 +16,6 @@ MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
VLSERVER=$(srcdir)/../vlserver
LWP=$(srcdir)/../lwp
LIBACL=$(srcdir)/../libacl
UTIL=$(srcdir)/../util
DIR=$(srcdir)/../dir
VOL=$(srcdir)/../vol
VOLSER=$(srcdir)/../volser
@ -30,8 +29,6 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o
DIROBJS=buffer.o dir.o salvage.o
VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
@ -41,12 +38,12 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
RXOBJS=rx_pthread.o
objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS}
${DIROBJS} ${VOLOBJS} ${RXOBJS}
LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/libusd.a
@ -95,27 +92,6 @@ vsutils.o: ${VOLSER}/vsutils.c
lockprocs.o: ${VOLSER}/lockprocs.c
$(AFS_CCRULE) $(VOLSER)/lockprocs.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
lock.o: ${LWP}/lock.c
$(AFS_CCRULE) $(LWP)/lock.c

2
src/libadmin/samples/Makefile.in
View File

@ -41,7 +41,7 @@ SAMPLELIBS =\
${TOP_LIBDIR}/libbosadmin.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(TOP_LIBDIR)/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/libafshcrypto_lwp.a

2
src/libadmin/test/Makefile.in
View File

@ -24,7 +24,7 @@ AFSCPLIBS =\
$(TOP_LIBDIR)/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \
$(TOP_LIBDIR)/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libafshcrypto_lwp.a
AFSCPOBJS =\

1
src/libafscp/Makefile.in
View File

@ -19,7 +19,6 @@ LIBOBJS = \
afscp_acl.o
all: \
${TOP_LIBDIR}/libafsutil.a \
${TOP_LIBDIR}/libafscp.a \
depinstall

41
src/tbudb/Makefile.in
View File

@ -13,15 +13,10 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
HELPER_SPLINT=@HELPER_SPLINT@
RX=$(srcdir)/../rx
UTIL=$(srcdir)/../util
BUDB=$(srcdir)/../budb
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
INCLS=\
${TOP_INCDIR}/lock.h \
${TOP_INCDIR}/ubik.h \
@ -38,14 +33,14 @@ INCLS=\
budb.h $(BUDB)/budb_client.h
# library ordering defined by top level makefile
LIBS=${RXOBJS} ${UTILOBJS} \
LIBS=${RXOBJS} \
${TOP_LIBDIR}/libbubasics.a \
${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/libafsutil.a
$(top_builddir)/src/util/liboafs_util.la
COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
@ -70,38 +65,6 @@ rx_pthread.o: ${RX}/rx_pthread.c
rxkad_errs.o: ../rxkad/rxkad_errs.c
$(AFS_CCRULE) ../rxkad/rxkad_errs.c
# get the pthreaded util stuff compiled here. we do this instead of
# using the non-pthreaded libutil.a. There probably should be a
# pthreaded version of this library, as we are doing with ubik itself, but...
#
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
hostparse.o: ${UTIL}/hostparse.c
$(AFS_CCRULE) $(UTIL)/hostparse.c
pthread_glock.o: ${UTIL}/pthread_glock.c
$(AFS_CCRULE) $(UTIL)/pthread_glock.c
database.o: ${BUDB}/database.c budb_errs.h ${INCLS}
$(AFS_CCRULE) $(BUDB)/database.c

2
src/tbutc/Makefile.in
View File

@ -56,7 +56,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/util.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/libusd.a \
${TOP_LIBDIR}/libprocmgmt.a

48
src/tptserver/Makefile.in
View File

@ -13,15 +13,10 @@ HELPER_SPLINT=@HELPER_SPLINT@
ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
RX=$(srcdir)/../rx
UTIL=$(srcdir)/../util
PTSERVER=$(srcdir)/../ptserver
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
INCLS=${TOP_INCDIR}/ubik.h \
@ -34,12 +29,12 @@ INCLS=${TOP_INCDIR}/ubik.h \
ptint.h \
pterror.h
LIBS_common=$(RXOBJS) $(UTILOBJS) \
LIBS_common=$(RXOBJS) \
${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la
LIBS_server= \
@ -69,45 +64,6 @@ rx_pthread.o: ${RX}/rx_pthread.c
rxkad_errs.o: ../rxkad/rxkad_errs.c
$(AFS_CCRULE) ../rxkad/rxkad_errs.c
#
# get the pthreaded util stuff compiled here. we do this instead of
# using the non-pthreaded libutil.a. There probably should be a
# pthreaded version of this library, as we are doing with ubik itself, but...
assert.o: ${UTIL}/assert.c
$(AFS_CCRULE) $(UTIL)/assert.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
hostparse.o: ${UTIL}/hostparse.c
$(AFS_CCRULE) $(UTIL)/hostparse.c
pthread_glock.o: ${UTIL}/pthread_glock.c
$(AFS_CCRULE) $(UTIL)/pthread_glock.c
pthread_threadname.o: ${UTIL}/pthread_threadname.c
$(AFS_CCRULE) $(UTIL)/pthread_threadname.c
ptserver.o: ${PTSERVER}/ptserver.c ${INCLS}
$(AFS_CCRULE) $(PTSERVER)/ptserver.c

38
src/tsalvaged/Makefile.in
View File

@ -23,7 +23,6 @@ SCFLAGS=$(COMMON_CFLAGS) -I.. -DRXDEBUG -DFSSYNC_BUILD_CLIENT \
SCCRULE=${MT_CC} ${SCFLAGS} -c $? -o $@
LWP=$(srcdir)/../lwp
UTIL=$(srcdir)/../util
DIR=$(srcdir)/../dir
VOL=$(srcdir)/../vol
@ -34,8 +33,6 @@ DIROBJS=buffer.o dir.o salvage.o
LWPOBJS=lock.o threadname.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
VLIBOBJS=volume.o vnode.o vutil.o partition.o fssync-client.o \
clone.o nuke.o devname.o listinodes.o ihandle.o \
namei_ops.o salvsync-server.o salvsync-client.o daemon_com.o
@ -43,16 +40,16 @@ SVLIBOBJS=s_volume.o s_vnode.o s_vutil.o s_partition.o s_fssync-client.o \
s_clone.o s_nuke.o s_devname.o s_listinodes.o s_ihandle.o \
s_namei_ops.o s_salvsync-server.o s_salvsync-client.o s_daemon_com.o
OBJECTS= ${SALVAGEDOBJS} ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
OBJECTS= ${SALVAGEDOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
SOBJECTS= ${SALVAGEROBJS} ${SVLIBOBJS}
FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
LIBS= ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/util.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la
@ -62,7 +59,7 @@ SLIBS= ${top_builddir}/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/liblwp.a \
${TOP_LIBDIR}/libsys.a \
${TOP_LIBDIR}/libacl.a \
${TOP_LIBDIR}/util.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la
all: salvageserver dafssync-debug salvsync-debug dasalvager
@ -114,27 +111,6 @@ physio.o: ${VOL}/physio.c
fssync-debug.o: ${VOL}/fssync-debug.c
$(AFS_CCRULE) $(VOL)/fssync-debug.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
buffer.o: ${DIR}/buffer.c
$(AFS_CCRULE) $(DIR)/buffer.c
@ -183,10 +159,6 @@ nuke.o: ${VOL}/nuke.c
devname.o: ${VOL}/devname.c
$(AFS_CCRULE) $(VOL)/devname.c
# only for darwin?
fstab.o: ${UTIL}/fstab.c
$(AFS_CCRULE) $(UTIL)/fstab.c
common.o: ${VOL}/common.c
$(AFS_CCRULE) $(VOL)/common.c

49
src/tubik/Makefile.in
View File

@ -14,7 +14,6 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
UBIK=$(srcdir)/../ubik
RX=$(srcdir)/../rx
UTIL=$(srcdir)/../util
LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \
ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
@ -26,14 +25,11 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
RXOBJS = rx_pthread.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
LIBS=${RXOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/comerr/liboafs_comerr.la \
${top_builddir}/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libsys.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${XLIBS} ${MT_LIBS}
@ -52,55 +48,20 @@ CFLAGS_rx_pthread.o = -DDPF_FSLOG
rx_pthread.o: ${RX}/rx_pthread.c
$(AFS_CCRULE) $(RX)/rx_pthread.c
#
# get the pthreaded util stuff compiled here. we do this instead of
# using the non-pthreaded libutil.a. There probably should be a
# pthreaded version of this library, as we are doing with ubik itself, but...
#
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
hostparse.o: ${UTIL}/hostparse.c
$(AFS_CCRULE) $(UTIL)/hostparse.c
pthread_glock.o: ${UTIL}/pthread_glock.c
$(AFS_CCRULE) $(UTIL)/pthread_glock.c
pthread_threadname.o: ${UTIL}/pthread_threadname.c
$(AFS_CCRULE) $(UTIL)/pthread_threadname.c
#
# insert comments here
#
utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a ${RXOBJS}
$(LT_LDRULE_static) utst_server.o utst_int.ss.o utst_int.xdr.o \
libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken)
utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a ${RXOBJS}
$(LT_LDRULE_static) utst_client.o utst_int.cs.o utst_int.xdr.o \
libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken)
udebug: udebug.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
udebug: udebug.o libubik_pthread.a ${RXOBJS}
$(LT_LDRULE_static) udebug.o libubik_pthread.a \
$(LIBS) $(LIB_hcrypto) $(LIB_roken)

45
src/tvlserver/Makefile.in
View File

@ -13,15 +13,10 @@ HELPER_SPLINT=@HELPER_SPLINT@
ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
RX=$(srcdir)/../rx
UTIL=$(srcdir)/../util
VLSERVER=$(srcdir)/../vlserver
RXOBJS= rx_pthread.o rxkad_errs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
pthread_threadname.o
INCLS=${TOP_INCDIR}/ubik.h \
${TOP_INCDIR}/lwp.h \
${TOP_INCDIR}/lock.h \
@ -36,7 +31,8 @@ LIBS_common = \
${TOP_LIBDIR}/libafsauthent.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libaudit.a \
$(top_builddir)/src/opr/liboafs_opr.la
LIBS_server = \
@ -46,7 +42,7 @@ LIBS_server = \
LIBS_client = \
$(LIBS_common)
OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS}
OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS}
all: \
vlserver vlclient vlserver cnvldb vldb_check \
@ -60,41 +56,6 @@ rx_pthread.o: ${RX}/rx_pthread.c
rxkad_errs.o: ../rxkad/rxkad_errs.c
$(AFS_CCRULE) ../rxkad/rxkad_errs.c
#
# get the pthreaded util stuff compiled here. we do this instead of
# using the non-pthreaded libutil.a. There probably should be a
# pthreaded version of this library, as we are doing with ubik itself, but...
#
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
hostparse.o: ${UTIL}/hostparse.c
$(AFS_CCRULE) $(UTIL)/hostparse.c
pthread_glock.o: ${UTIL}/pthread_glock.c
$(AFS_CCRULE) $(UTIL)/pthread_glock.c
pthread_threadname.o: ${UTIL}/pthread_threadname.c
$(AFS_CCRULE) $(UTIL)/pthread_threadname.c
#
# Other stuff

33
src/tvolser/Makefile.in
View File

@ -17,7 +17,6 @@ MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
VLSERVER=$(srcdir)/../vlserver
LWP=$(srcdir)/../lwp
LIBACL=$(srcdir)/../libacl
UTIL=$(srcdir)/../util
DIR=$(srcdir)/../dir
VOL=$(srcdir)/../vol
VOLSER=$(srcdir)/../volser
@ -33,8 +32,6 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
@ -44,15 +41,15 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
RXOBJS=rx_pthread.o
objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS}
${DIROBJS} ${VOLOBJS} ${RXOBJS}
vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
${VOLOBJS} ${RXOBJS}
LIBS_common = \
$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libusd.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/opr/liboafs_opr.la
@ -109,30 +106,6 @@ vsutils.o: ${VOLSER}/vsutils.c
lockprocs.o: ${VOLSER}/lockprocs.c
$(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
pthread_threadname.o: ${UTIL}/pthread_threadname.c
$(AFS_CCRULE) $(UTIL)/pthread_threadname.c
lock.o: ${LWP}/lock.c
$(AFS_CCRULE) $(LWP)/lock.c

139
src/util/Makefile.in
View File

@ -7,37 +7,19 @@
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.libtool
include @TOP_OBJDIR@/src/config/Makefile.lwp
HELPER_SPLINT=@HELPER_SPLINT@
LT_objs =base64.lo ktime.lo volparse.lo hostparse.lo exec.lo \
hputil.lo kreltime.lo uuid.lo serverLog.lo \
dirpath.lo fileutil.lo flipbase64.lo fstab.lo \
afs_atomlist.lo afs_lhash.lo pthread_glock.lo tabular_output.lo \
pthread_threadname.lo softsig.lo ${REGEX_OBJ}
objects =base64.o ktime.o volparse.o hostparse.o exec.o \
hputil.o kreltime.o uuid.o serverLog.o \
dirpath.o fileutil.o flipbase64.o fstab.o \
afs_atomlist.o afs_lhash.o pthread_glock.o tabular_output.o \
pthread_threadname.o ${REGEX_OBJ}
objects_pic = \
base64_pic.o \
ktime_pic.o \
volparse_pic.o \
hostparse_pic.o \
exec_pic.o \
hputil_pic.o \
kreltime_pic.o \
uuid_pic.o \
serverLog_pic.o \
dirpath_pic.o \
fileutil_pic.o \
flipbase64_pic.o \
fstab_pic.o \
afs_atomlist_pic.o \
afs_lhash_pic.o \
pthread_glock_pic.o \
tabular_output_pic.o \
pthread_threadname_pic.o \
${REGEX_OBJ_PIC}
LT_deps = $(top_builddir)/src/opr/liboafs_opr.la
LT_libs = $(LIB_roken) $(MT_LIBS)
includes = \
${TOP_INCDIR}/afs/dirpath.h \
@ -62,7 +44,17 @@ all: ${includes} \
${TOP_LIBDIR}/util.a \
${TOP_LIBDIR}/libafsutil.a \
${TOP_LIBDIR}/libafsutil_pic.a \
sys
sys \
liboafs_util.la
util.a: $(LT_objs)
$(LT_LDLIB_lwp) $(LT_objs)
libafsutil_pic.la: $(LT_objs)
$(LT_LDLIB_pic) $(LT_objs)
liboafs_util.la: liboafs_util.la.sym $(LT_objs) $(LT_deps)
$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h
buildtools_clean: clean
@ -129,8 +121,8 @@ ${TOP_LIBDIR}/util.a: util.a
${TOP_LIBDIR}/libafsutil.a: util.a
${INSTALL_DATA} $? $@
${TOP_LIBDIR}/libafsutil_pic.a: util_pic.a
${INSTALL_DATA} $? $@
${TOP_LIBDIR}/libafsutil_pic.a: libafsutil_pic.la
${INSTALL_DATA} .libs/libafsutil_pic.a $@
# Use " as the sed boundary character because we lose anyway if that occurs
# in path names.
@ -149,97 +141,21 @@ dirpath.h: ${srcdir}/dirpath.hin Makefile
-e 's"@afsdatadir"${afsdatadir}"' \
${srcdir}/dirpath.hin >dirpath.h
util.a: ${objects} AFS_component_version_number.o
$(RM) -f util.a
$(AR) crv util.a ${objects} AFS_component_version_number.o
$(RANLIB) util.a
util_pic.a: ${objects_pic} AFS_component_version_number_pic.o
$(RM) -f util_pic.a
$(AR) crv util_pic.a ${objects_pic} AFS_component_version_number_pic.o
$(RANLIB) util_pic.a
pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
pthread_threadname.o: ${srcdir}/pthread_threadname.c ${includes}
${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_threadname.c
${objects}: ${includes}
AFS_component_version_number_pic.o: AFS_component_version_number.c
$(SHD_CCRULE) AFS_component_version_number.c
$(LT_objs): ${includes}
sys.o: sys.c AFS_component_version_number.c ${includes}
sys: sys.o
$(AFS_LDRULE) sys.o
# PIC objects build rules
base64_pic.o: ${srcdir}/base64.c ${includes}
$(SHD_CCRULE) ${srcdir}/base64.c
ktime_pic.o: ${srcdir}/ktime.c ${includes}
$(SHD_CCRULE) ${srcdir}/ktime.c
volparse_pic.o: ${srcdir}/volparse.c ${includes}
$(SHD_CCRULE) ${srcdir}/volparse.c
hostparse_pic.o: ${srcdir}/hostparse.c ${includes}
$(SHD_CCRULE) ${srcdir}/hostparse.c
exec_pic.o: ${srcdir}/exec.c ${includes}
$(SHD_CCRULE) ${srcdir}/exec.c
hputil_pic.o: ${srcdir}/hputil.c ${includes}
$(SHD_CCRULE) ${srcdir}/hputil.c
kreltime_pic.o: ${srcdir}/kreltime.c ${includes}
$(SHD_CCRULE) ${srcdir}/kreltime.c
uuid_pic.o: ${srcdir}/uuid.c ${includes}
$(SHD_CCRULE) ${srcdir}/uuid.c
serverLog_pic.o: ${srcdir}/serverLog.c ${includes}
$(SHD_CCRULE) ${srcdir}/serverLog.c
dirpath_pic.o: ${srcdir}/dirpath.c ${includes}
$(SHD_CCRULE) ${srcdir}/dirpath.c
fileutil_pic.o: ${srcdir}/fileutil.c ${includes}
$(SHD_CCRULE) ${srcdir}/fileutil.c
flipbase64_pic.o: ${srcdir}/flipbase64.c ${includes}
$(SHD_CCRULE) ${srcdir}/flipbase64.c
fstab_pic.o: ${srcdir}/fstab.c ${includes}
$(SHD_CCRULE) ${srcdir}/fstab.c
afs_atomlist_pic.o: ${srcdir}/afs_atomlist.c ${includes}
$(SHD_CCRULE) ${srcdir}/afs_atomlist.c
afs_lhash_pic.o: ${srcdir}/afs_lhash.c ${includes}
$(SHD_CCRULE) ${srcdir}/afs_lhash.c
pthread_glock_pic.o: ${srcdir}/pthread_glock.c ${includes}
$(SHD_CCRULE) ${srcdir}/pthread_glock.c
pthread_threadname_pic.o: ${srcdir}/pthread_threadname.c ${includes}
$(SHD_CCRULE) ${srcdir}/pthread_threadname.c
tabular_output_pic.o: ${srcdir}/tabular_output.c ${includes}
$(SHD_CCRULE) ${srcdir}/tabular_output.c
regex_pic.o: ${srcdir}/regex.c ${includes}
$(SHD_CCRULE) ${srcdir}/regex.c
#
# Install targets
#
KDIR=../libafs/afs
UKDIR=../libuafs/afs
install: dirpath.h util.a util_pic.a sys
install: dirpath.h util.a sys
${INSTALL} -d ${DESTDIR}${includedir}/afs
${INSTALL} -d ${DESTDIR}${libdir}/afs
${INSTALL} -d ${DESTDIR}${bindir}
@ -262,10 +178,9 @@ install: dirpath.h util.a util_pic.a sys
${INSTALL_DATA} ${srcdir}/tabular_output.h ${DESTDIR}${includedir}/afs/tabular_output.h
${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/util.a
${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/libafsutil.a
${INSTALL_DATA} util_pic.a ${DESTDIR}${libdir}/afs/libafsutil_pic.a
${INSTALL_PROGRAM} sys ${DESTDIR}${bindir}/sys
dest: dirpath.h util.a util_pic.a sys
dest: dirpath.h util.a sys
${INSTALL} -d ${DEST}/include/afs
${INSTALL} -d ${DEST}/lib/afs
${INSTALL} -d ${DEST}/bin
@ -288,7 +203,6 @@ dest: dirpath.h util.a util_pic.a sys
${INSTALL_DATA} ${srcdir}/tabular_output.h ${DEST}/include/afs/tabular_output.h
${INSTALL_DATA} util.a ${DEST}/lib/afs/util.a
${INSTALL_DATA} util.a ${DEST}/lib/afs/libafsutil.a
${INSTALL_DATA} util_pic.a ${DEST}/lib/afs/libafsutil_pic.a
${INSTALL_PROGRAM} sys ${DEST}/bin/sys
#
@ -296,8 +210,9 @@ dest: dirpath.h util.a util_pic.a sys
#
clean:
$(RM) -f ${objects} sys dirpath.h
$(RM) -f util.a util_pic.a *.o core AFS_component_version_number.c
$(LT_CLEAN)
$(RM) -f sys dirpath.h
$(RM) -f util.a *.o core AFS_component_version_number.c
test:
cd test; $(MAKE)

53
src/util/liboafs_util.la.sym Normal file
View File

@ -0,0 +1,53 @@
afs_inet_ntoa_r
hostutil_GetHostByName
hostutil_GetNameByINet
gettmpdir
util_GetInt32
util_GetInt64
OpenLog
ReOpenLog
LogLevel
LogThreadNum
LogCommandLine
FSLog
serverLogSyslogFacility
serverLogSyslog
serverLogSyslogTag
SetupLogSignals
SetLogThreadNumProgram
grmutex
getDirPath
initAFSDirPath
pthread_recursive_mutex_lock
pthread_recursive_mutex_unlock
vFSLog
BufioOpen
BufioGets
BufioClose
afs_uuid_equal
afs_uuid_is_nil
afsUUID_to_string
afsUUID_from_string
afs_ntohuuid
afs_htonuuid
volutil_GetPartitionID
volutil_PartitionName
volutil_PartitionName_r
volutil_PartitionName2_r
flipbase64_to_int64
int64_to_flipbase64
util_GetHumanInt32
util_GetUInt32
ktime_DateToInt32
afs_pthread_setname_self
Int32To_ktimeRelDate
Add_RelDate_to_Time
softsig_signal
softsig_init
afs_uuid_create
afs_uuid_hash
mrafsStyleLogs
grmutex
pthread_recursive_mutex_lock
pthread_recursive_mutex_unlock
getDirPath

2
src/venus/Makefile.in
View File

@ -28,7 +28,7 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(TOP_LIBDIR)/libafsutil.a \
$(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la
FSLIBS=${TOP_LIBDIR}/libsys.a \

37
src/viced/Makefile.in
View File

@ -18,7 +18,6 @@ RX=$(srcdir)/../rx
VLSERVER=$(srcdir)/../vlserver
LWP=$(srcdir)/../lwp
LIBACL=$(srcdir)/../libacl
UTIL=$(srcdir)/../util
DIR=$(srcdir)/../dir
VOL=$(srcdir)/../vol
FSINT=$(srcdir)/../fsint
@ -32,26 +31,24 @@ LWPOBJS=lock.o threadname.o
LIBACLOBJS=aclprocs.o netprocs.o
UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
DIROBJS=buffer.o dir.o salvage.o
VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
fstab.o salvsync-client.o daemon_com.o vg_cache.o vg_scan.o
salvsync-client.o daemon_com.o vg_cache.o vg_scan.o
FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
RXOBJS = rx_pthread.o
objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
LIBS=${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \
${TOP_LIBDIR}/util.a
$(top_builddir)/src/util/liboafs_util.la
all: cbd fsprobe check_sysid fileserver ${TOP_INCDIR}/afs/fs_stats.h
@ -79,30 +76,6 @@ CFLAGS_rx_pthread.o = -DDPF_FSLOG
rx_pthread.o: ${RX}/rx_pthread.c
$(AFS_CCRULE) $(RX)/rx_pthread.c
uuid.o: ${UTIL}/uuid.c
$(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
$(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
$(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
$(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
$(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
$(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
$(AFS_CCRULE) $(UTIL)/softsig.c
pthread_threadname.o: ${UTIL}/pthread_threadname.c
$(AFS_CCRULE) $(UTIL)/pthread_threadname.c
lock.o: ${LWP}/lock.c
$(AFS_CCRULE) $(LWP)/lock.c
@ -171,10 +144,6 @@ nuke.o: ${VOL}/nuke.c
devname.o: ${VOL}/devname.c
$(AFS_CCRULE) $(VOL)/devname.c
# only for darwin?
fstab.o: ${UTIL}/fstab.c
$(AFS_CCRULE) $(UTIL)/fstab.c
common.o: ${VOL}/common.c
$(AFS_CCRULE) $(VOL)/common.c

3
tests/auth/Makefile.in
View File

@ -15,7 +15,8 @@ MODULE_LIBS = ../tap/libtap.a \
$(abs_top_builddir)/lib/libafsrpc.a \
$(abs_top_builddir)/lib/libafshcrypto.a \
$(abs_top_builddir)/src/opr/liboafs_opr.la \
$(LIB_rfc3961) $(LIB_roken) -lafsutil\
$(abs_top_builddir)/src/util/liboafs_util.la \
$(LIB_rfc3961) $(LIB_roken) \
$(XLIBS)
authcon-t: authcon-t.o ../common/config.o

2
tests/cmd/Makefile.in
View File

@ -11,7 +11,7 @@ LIBS = ../tap/libtap.a \
$(abs_top_builddir)/src/cmd/liboafs_cmd.la \
$(abs_top_builddir)/src/comerr/liboafs_comerr.la \
$(abs_top_builddir)/src/opr/liboafs_opr.la \
$(abs_top_builddir)/lib/util.a
$(abs_top_builddir)/src/opr/liboafs_opr.la
tests = command-t

9
tests/rpctestlib/Makefile.in
View File

@ -14,7 +14,6 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
RTL=@TOP_OBJDIR@/tests/rpctestlib
RX = ${srcdir}/../../src/rx
VICED=@TOP_OBJDIR@/src/viced
UTIL=@TOP_OBJDIR@/src/util
FSINT=@TOP_OBJDIR@/src/fsint
MCAS=@TOP_OBJDIR@/src/mcas
OSI=@TOP_OBJDIR@/src/osi
@ -34,7 +33,8 @@ RXOBJS = rx_pthread.o
LIBOBJS= ${RTLOBJS} ${FSINTOBJS} ${RXOBJS}
LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/libopr.a ${TOP_LIBDIR}/util.a
LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/libopr.a \
$(top_builddir)/src/util/liboafs_util.la
all: xmpl_driver
@ -62,8 +62,8 @@ afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
$(AFS_CCRULE) ${FSINT}/afscbint.xdr.c
xmpl_driver: librpc_test_lib.a rpc_test_main.o ${LIBS}
$(AFS_LDRULE) rpc_test_main.o librpc_test_lib.a \
${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
$(LT_LDRULE_static) rpc_test_main.o librpc_test_lib.a \
${LIBS} ${LIB_hcrypto} ${MT_LIBS} ${XLIBS}
librpc_test_lib.a: ${LIBOBJS}
$(RM) -f $@
@ -75,6 +75,7 @@ install:
dest:
clean:
$(LT_CLEAN)
$(RM) -f *.o *.a *.gch xmpl_driver core
include @TOP_OBJDIR@/src/config/Makefile.version

3
tests/volser/Makefile.in
View File

@ -21,7 +21,8 @@ MODULE_LIBS = ../tap/libtap.a \
$(abs_top_builddir)/lib/libafsrpc.a \
$(abs_top_builddir)/lib/libafshcrypto.a \
$(abs_top_builddir)/src/opr/liboafs_opr.la \
$(LIB_rfc3961) $(LIB_roken) -lafsutil\
$(abs_top_builddir)/src/opr/liboafs_util.la \
$(LIB_rfc3961) $(LIB_roken) \
$(XLIBS)
vos-t: vos-t.o ../common/config.o ../common/servers.o ../common/ubik.o