From 61414ab7a8adb3854dcd08aeaf5c642aea8477eb Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Sat, 18 Dec 2010 23:52:43 -0500 Subject: [PATCH] Rename libcom_err to libafscom_err We no longer provide a compatible libcom_err, and in fact we renamed the symbols in our libcom_err several years ago to reflect this fact. When we build on a system where KRB5_LIBS includes -lkrb5 -lcom_err , the new Unix build system will pick up our libcom_err (as $(AFS_LDFLAGS) is the first argument in AFS_LDRULE and pulls in a linker search path for our libcom_err) which does not provide all the needed symbols for libkrb5. Fully rename our libcom_err away to avoid these conflicts. FIXES 128640 Reviewed-on: http://gerrit.openafs.org/3547 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 352c3e366c2e0a8de4550547192276e62afd2cc1) Change-Id: I3aa116d280fe1b0efdfda79787f53fbee336a4e3 Reviewed-on: http://gerrit.openafs.org/4572 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/afsweb/Makefile.in | 2 +- src/aklog/Makefile.in | 2 +- src/bozo/Makefile.in | 2 +- src/bucoord/Makefile.in | 2 +- src/budb/Makefile.in | 2 +- src/butc/Makefile.in | 2 +- src/butm/Makefile.in | 4 ++-- src/cmd/test/Makefile.in | 2 +- src/comerr/Makefile.in | 16 ++++++++-------- src/comerr/test/Makefile.in | 4 ++-- src/finale/Makefile.in | 2 +- src/fsprobe/Makefile.in | 2 +- src/gtx/Makefile.in | 2 +- src/kauth/Makefile.in | 4 ++-- src/kauth/test/Makefile.in | 2 +- src/packaging/FreeBSD/pkg-plist | 2 +- src/ptserver/Makefile.in | 2 +- src/rxkad/test/Makefile.in | 4 ++-- src/scout/Makefile.in | 2 +- src/sgistuff/Makefile.in | 2 +- src/tests/Makefile.in | 4 ++-- src/tsm41/Makefile.in | 4 ++-- src/tubik/Makefile.in | 2 +- src/ubik/Makefile.in | 2 +- src/update/Makefile.in | 2 +- src/uss/Makefile.in | 2 +- src/venus/Makefile.in | 4 ++-- src/venus/test/Makefile.in | 2 +- src/viced/Makefile.in | 2 +- src/vlserver/Makefile.in | 2 +- src/volser/Makefile.in | 4 ++-- 31 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 23e40afbc..1c2671267 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -176,7 +176,7 @@ LIBS=${kauthlib} ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a \ ${authlib} ${rxkadlib} ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a ${deslib} ${cmdlib} \ - ${TOP_LIBDIR}/libcom_err.a ${utilib} \ + ${TOP_LIBDIR}/libafscom_err.a ${utilib} \ $(DBM) $(XLIBS) AR=ar diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index a0c2d1c62..372cda50c 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -15,7 +15,7 @@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a SRCS= aklog.c krb_util.c linked_list.c diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index c386254bf..4890fe0d9 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -35,7 +35,7 @@ LIBS=${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/librx.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libprocmgmt.a diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index e02ea4b4a..465f5538b 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -20,7 +20,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/util.a all: ${TOP_LIBDIR}/libbxdb.a ${TOP_INCDIR}/afs/bucoord_prototypes.h ${TOP_INCDIR}/afs/bc.h backup diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index ef251bb5c..29ce529e7 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -41,7 +41,7 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index fabfeaf20..34ad963c0 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -43,7 +43,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libusd.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libprocmgmt.a diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index c230a062c..33645c5e1 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -17,9 +17,9 @@ INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h LIBS=${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libusd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libbutm.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ ${XLIBS} diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index d0adeb36d..52226438b 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -LIBS=-lcmd -lcom_err -lafsutil +LIBS=-lcmd -lafscom_err -lafsutil INCDIRS= -I${SRCDIR}/include -I${SRCDIR}/include/afs -I.. diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index a22742d4c..b6533b5f9 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -11,7 +11,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a +all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libafscom_err.a buildtools: compile_et @@ -24,7 +24,7 @@ ${TOP_INCDIR}/afs/error_table.h: error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h ${INSTALL_DATA} $? $@ -${TOP_LIBDIR}/libcom_err.a: libcom_err.a +${TOP_LIBDIR}/libafscom_err.a: libafscom_err.a ${INSTALL_DATA} $? $@ et_lex.lex.c: et_lex.lex.l @@ -39,7 +39,7 @@ compile_et: compile_et.o error_table.o ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ esac -libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o +libafscom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o $(RM) -f $@ $(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o $(RANLIB) $@ @@ -54,7 +54,7 @@ error_table.o: error_table.c # # Installation targets # -install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a +install: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} -d ${DESTDIR}${includedir}/afs ${INSTALL} -d ${DESTDIR}${libdir}/afs @@ -62,9 +62,9 @@ install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a ${INSTALL_DATA} ${srcdir}/com_err.h ${DESTDIR}${includedir}/afs/com_err.h ${INSTALL_DATA} ${srcdir}/error_table.h ${DESTDIR}${includedir}/afs/error_table.h ${INSTALL_DATA} ${srcdir}/mit-sipb-cr.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h - ${INSTALL_DATA} libcom_err.a ${DESTDIR}${libdir}/afs/libcom_err.a + ${INSTALL_DATA} libafscom_err.a ${DESTDIR}${libdir}/afs/libafscom_err.a -dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a +dest: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a ${INSTALL} -d ${DEST}/bin ${INSTALL} -d ${DEST}/include/afs ${INSTALL} -d ${DEST}/lib/afs @@ -72,11 +72,11 @@ dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a ${INSTALL_DATA} ${srcdir}/com_err.h ${DEST}/include/afs/com_err.h ${INSTALL_DATA} ${srcdir}/error_table.h ${DEST}/include/afs/error_table.h ${INSTALL_DATA} ${srcdir}/mit-sipb-cr.h ${DEST}/include/afs/mit-sipb-cr.h - ${INSTALL_DATA} libcom_err.a ${DEST}/lib/afs/libcom_err.a + ${INSTALL_DATA} libafscom_err.a ${DEST}/lib/afs/libafscom_err.a clean: $(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ - *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libcom_err.a \ + *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libafscom_err.a \ com_err.o compile_et et.ar TAGS y.tab.c lex.yy.c error_table.c \ et_lex.lex.c test1.h test1.c test2.h test2.c \ eddep makedep core AFS_component_version_number.c diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 28211239c..4d7cad071 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -20,7 +20,7 @@ install: # Build targets # test: test.o test1.o test2.o - $(CC) ${CFLAGS} -o test test.o test1.o test2.o + $(CC) ${CFLAGS} -o test -lafscom_err test.o test1.o test2.o test.o: test1.h test2.h test1.o : test1.c @@ -35,7 +35,7 @@ clean: $(RM) -f *~ \#* *.bak \ *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ *.cp *.fn *.ky *.log *.pg *.tp *.vr \ - *.o *.a libcom_err.a \ + *.o *.a libafscom_err.a \ com_err.o compile_et \ et.ar TAGS y.tab.c lex.yy.c error_table.c \ et_lex.lex.c \ diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index 176095e95..379f69bc8 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -36,7 +36,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libvldb.a \ ${TOP_LIBDIR}/libbos.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libvolser.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libkauth.a \ diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index 040d8b982..af1244baa 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -21,7 +21,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libaudit.a \ ${TOP_LIBDIR}/libafsint.a \ ${TOP_LIBDIR}/librx.a \ diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index d0a8f0c0d..8f92cd63f 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -39,7 +39,7 @@ LIBS=\ ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a EXTRA_LIBS=${LIB_curses} ${XLIBS} diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 4887bb185..9ba2cb517 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -32,7 +32,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsutil.a \ $(DBM) @@ -49,7 +49,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsutil.a OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 917136ec0..5b466d2b8 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INCDIRS= -I${DESTDIR}/include -I.. LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth +LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lafscom_err -lkauth CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} diff --git a/src/packaging/FreeBSD/pkg-plist b/src/packaging/FreeBSD/pkg-plist index 147578a25..afdce82c1 100644 --- a/src/packaging/FreeBSD/pkg-plist +++ b/src/packaging/FreeBSD/pkg-plist @@ -169,6 +169,7 @@ include/openafs/timer.h include/openafs/ubik.h include/openafs/ubik_int.h lib/afs/libacl.a +lib/afs/libafscom_err.a lib/afs/libafsint.a lib/afs/libafsutil.a lib/afs/libaudit.a @@ -180,7 +181,6 @@ lib/afs/libbudb.a lib/afs/libbutm.a lib/afs/libbxdb.a lib/afs/libcmd.a -lib/afs/libcom_err.a lib/afs/libdir.a lib/afs/libfsprobe.a lib/afs/libgtx.a diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 1c237c7a4..d07520bd0 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -38,7 +38,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 7f6ed11ec..8af723936 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -25,10 +25,10 @@ LIBS=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a -THLIBS= ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a \ +THLIBS= ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ ${MT_LIBS} ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 8302d93d5..374bfb354 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -41,7 +41,7 @@ LIBS=${TOP_LIBDIR}/libgtx.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libaudit.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/util.a diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 44eec2850..9d09c824e 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -25,7 +25,7 @@ LIBDIR=${TOP_LIBDIR}/ AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/util.a KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \ diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index cf36bec5a..a90b79102 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -26,7 +26,7 @@ LIBS=\ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/util.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${XLIBS} OBJS_afsdump_scan = afsdump_scan.o repair.o @@ -100,7 +100,7 @@ SYS_LIBS = ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a $ AUTH_LIBS = ${TOP_LIBDIR}/libauth.a ${SYS_LIBS} -INT_LIBS = ${TOP_LIBDIR}/libafsint.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a +INT_LIBS = ${TOP_LIBDIR}/libafsint.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/util.a TEST_PROGRAMS = write-ro-file hello-world read-vs-mmap read-vs-mmap2 \ mmap-and-read large-dir large-dir2 large-dir3 mountpoint \ diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index d1f4b2eb0..8751f8f32 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -27,7 +27,7 @@ AFSLIBS = \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libaudit.a @@ -42,7 +42,7 @@ KAFSLIBS = \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libaudit.a diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 4e73de700..43e059ce7 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -33,7 +33,7 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \ pthread_glock.o strlcat.o strlcpy.o strnlen.o LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libsys.a ${XLIBS} \ ${LDFLAGS} ${MT_LIBS} diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 92ae7897c..d219d28b2 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -21,7 +21,7 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/lock.h ubik.h ubik_int.h LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 03b2530ac..56e9fc8f9 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -19,7 +19,7 @@ LIBS=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a all: upserver upclient diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 08268126b..e3d4dfea6 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -32,7 +32,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a\ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ ${XLIBS} diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index f6ed08ade..e996bb177 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -22,7 +22,7 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/vlib.a \ ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libdes.a \ @@ -36,7 +36,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsint.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libauth.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index d96ef153c..7dc18f509 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -15,7 +15,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I.. LDIRS= -L${TOP_LIBDIR} -L.. -LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil +LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lafscom_err -lcmd -lrx -llwp -lafsutil CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS} diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index b0be72554..bfb3f4b13 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -36,7 +36,7 @@ LIBS=${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafsutil.a diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index c4a55eb41..2c0279beb 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -30,7 +30,7 @@ LIBS=\ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 3ffc825da..1cb379abf 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -39,7 +39,7 @@ LIBS=\ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libsys.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libusd.a \ ${TOP_LIBDIR}/util.a @@ -50,7 +50,7 @@ VOLDUMP_LIBS = \ ../vol/vlib.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a \ - ${TOP_LIBDIR}/libcom_err.a \ + ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libdir.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ -- 2.39.5