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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 352c3e366c2e0a8de4550547192276e62afd2cc1)

Change-Id: I3aa116d280fe1b0efdfda79787f53fbee336a4e3
Reviewed-on: http://gerrit.openafs.org/4572
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index 23e40afbcf3f9c04f4195416f79a5b6919211384..1c26712675de6d4c4a6d0da1eeae98800e06be27 100644 (file)
--- 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 a0c2d1c629f458386e6ef3500db13c93b014054f..372cda50cc79d83bd17c7506593f48188610f498 100644 (file)
--- 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 c386254bf5e47e651d044d9c8db412fe41d63612..4890fe0d99cbe24f800c956fb7250d007072c5c8 100644 (file)
--- 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 e02ea4b4ad9eace8977d9590a5ec29a03b30ef48..465f5538b1f6e8135fccad5c10a12b2bda621c40 100644 (file)
--- 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 ef251bb5cdac712f94340f1e6294072a277e1727..29ce529e7d1ce673abaaea39f07cfde9b9971ae2 100644 (file)
--- 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 fabfeaf20c145e60fcc2c2dac0b7efdaf1282f46..34ad963c0d8345af3f2c744dce1af1b1e759694d 100644 (file)
--- 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 c230a062cf5799a7dfb594238d6febfa81cfb670..33645c5e176d35ec00ad990319922df415784efe 100644 (file)
--- 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 d0adeb36dabeb7351a0e8b4d29a13832b960bcfb..52226438b6dd40958dded42ab7ff94d6766463af 100644 (file)
--- 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 a22742d4c0a758706d62407f2797ab331f5e7683..b6533b5f950c8285b73c85345acef376413e4dcb 100644 (file)
--- 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 28211239c2244e4c269455206543bf118775e0b5..4d7cad0712f3923e81fde018cc2a9913da6aa2bd 100644 (file)
--- 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 176095e958e6afbfc5a328ad7d5302c7121411b8..379f69bc8e39ce4e73a5bd26eb985ec8487b7b99 100644 (file)
--- 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 040d8b98237c1dc491d9b8e4b051985648db7e53..af1244baabd850ed602c7fc18a559cd6daafe97d 100644 (file)
--- 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 d0a8f0c0d19e2cb51b20d737ef7f36f1cfe1b0aa..8f92cd63fe684995df5747085481f708c1f7db02 100644 (file)
--- 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 4887bb185e0fffda7231bff164ed2d6f47a8451d..9ba2cb5179f3ef475025bee5ee3e31cf8723e4b6 100644 (file)
--- 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 917136ec06f0c6994c76b605bdba3dade3502752..5b466d2b83e64a39465a5818aafaec15942c7708 100644 (file)
--- 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 147578a25d9506409cce97869b591a87e3081ff0..afdce82c1d35e98d2a186f92469cbeb46a8f4ba6 100644 (file)
--- 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 1c237c7a40d448b35883c0641e8dc47b19e3e3dc..d07520bd09abf9d5a538a566f6590c103814e7ab 100644 (file)
--- 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 7f6ed11ecfb7502441fd5b6e18ff67aa362661e5..8af72393611f734b7cd99570496a032be74fa3d2 100644 (file)
--- 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 8302d93d57ce4809aab662a36b5c2ded5eee2bd6..374bfb354c25aeaaebbd9e451fa5d6bf3fe02f26 100644 (file)
--- 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 44eec2850265d23df4e43bbef0ba925871261322..9d09c824ee14cc4f826d99159dca8d6321fab995 100644 (file)
--- 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 cf36bec5a40cff6df40995f68366b575745181ad..a90b791025e5c71c2642f6502ba115a7317252bd 100644 (file)
--- 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 d1f4b2eb0e4a0046f00f5a5d409f7c6a09f40108..8751f8f320bf96d6b96b9241016b0617de7e95df 100644 (file)
--- 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 4e73de70053c1026d28fd10fea03f6b2cea1638b..43e059ce785dbea39f4e8cb26393475899f81a8d 100644 (file)
--- 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 92ae7897c45b064de9bcb30e21dffa33ef567d47..d219d28b212cbc7dafe26c86078673c066408de1 100644 (file)
--- 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 03b2530ac4f283196cfa346b401fceaf88411071..56e9fc8f9c44d26c5c35e60fa070ec58e5df98e0 100644 (file)
--- 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 08268126bb130c7e37b6a7df7b2b548c59073658..e3d4dfea671ea5f6cc64565add0f393719417989 100644 (file)
--- 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 f6ed08ade5a8764eca9274a49276cd25157caece..e996bb177a61f2fcfee75304ed602a964b38f03b 100644 (file)
--- 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 d96ef153c1da44b4d7c56b35536614436836cfdd..7dc18f50956be91dd37b2b74ba70d9c753800a65 100644 (file)
--- 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 b0be725540b5d194e2e80905c0cbfb9ed3ef5342..bfb3f4b132c425d509b1aa4530bb56f6bc554565 100644 (file)
--- 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 c4a55eb412702233f2adf8ed0d1b22e593fd2795..2c0279beb433ebe89a062524b9977b50ca61d601 100644 (file)
--- 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 3ffc825da11584bbb4fb4f43e4ec87ab189b31b5..1cb379abfcce5ee23904f25a1fd43cf51432e221 100644 (file)
--- 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  \