Stop using libafsrpc

Instead of using libafsrpc.a in the pthreaded server directories,
use the libtool library variants instead.

Change-Id: I4cdbaf5a060b3e5aa82fb0d79535cb4fdc850bcf
Reviewed-on: http://gerrit.openafs.org/8074
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 96b545d78fe84fabe63195c201f80d65f9194dda..a25ebf0ba8ecb501006d2a781e303d619a4e682b 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -22,9 +22,8 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
 
 AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libsys.a \
+       $(top_builddir)/src/sys/liboafs_sys.la \
        $(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 \

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index bcb9e6c15faaa9d89211edd0448a69fef5653a90..ba65471cdd4ea60cbc4003f32f9f1342896dbab9 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -11,8 +11,9 @@ MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
 
 AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5)
 AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
-         ${TOP_LIBDIR}/libafsrpc.a \
         ${TOP_LIBDIR}/libafshcrypto.a \
+        $(top_builddir)/src/sys/liboafs_sys.la \
+        $(top_builddir)/src/rxkad/liboafs_rxkad.la \
         $(top_builddir)/src/cmd/liboafs_cmd.la \
         $(top_builddir)/src/opr/liboafs_opr.la \
          $(top_builddir)/src/util/liboafs_util.la

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index 5b220ac2674af87b188a11f9a459fbc13015162c..f27599774f381d7c8674b66362c97d3c97e25d2b 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -44,9 +44,11 @@ SDBGOBJS = state_analyzer.o \
           $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
-     $(top_builddir)/src/fsint/liboafs_fsint.la \
+     $(top_builddir)/src/sys/liboafs_sys.la \
+     $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+     $(top_builddir)/src/rxstat/liboafs_rxstat.la \
      $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+     $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
      $(top_builddir)/src/util/liboafs_util.la

diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index 7d52a319ac5d8c44deb7b6f376b5280f8839084e..3369549bd3db803ed1aeea4f48dfd6e4bfef08ec 100644 (file)
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -36,8 +36,11 @@ objects= ${VOLSEROBJS} ${LIBACLOBJS} \
 
 LIBS=  $(top_builddir)/src/cmd/liboafs_cmd.la          \
        ${TOP_LIBDIR}/libafsauthent.a   \
-       ${TOP_LIBDIR}/libafsrpc.a       \
-       $(top_builddir)/src/lwp/liboafs_lwpcompat.la    \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+        $(top_builddir)/src/rx/liboafs_rx.la \
+        $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+        $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+        $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
        $(top_builddir)/src/util/liboafs_util.la        \
        $(top_builddir)/src/opr/liboafs_opr.la          \
        $(top_builddir)/src/usd/liboafs_usd.la

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 05cef0ca609ad6d63c4ae6a3ec6aadc074cee5cc..267a0e7e1e791d8286fadf33419a8316189405bb 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -93,7 +93,7 @@ depinstall: \
        ${UKERNELDIR}/afs/afsl.exp \
        Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h
 
-libsys.a: $(LT_objs) afsl.exp
+libsys.a: $(LT_objs) afsl.exp syscall.lo
        @set -e; set -x; case "$(SYS_NAME)" in \
        rs_aix*) \
            $(LT_LDLIB_lwp) $(LT_objs) syscall.o afsl.exp ;; \
@@ -106,7 +106,8 @@ libsys.a: $(LT_objs) afsl.exp
 liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp
        @set -e; set -x; case "$(SYS_NAME)" in \
        rs_aix*) \
-           $(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;; \
+           $(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;\
+           $(AR) crv .libs/liboafs_sys.a ../sys/afsl.exp ;; \
        *) \
            $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) ;; \
        esac

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 6abbb26a3ac46767df7e0b4d5bd7563ffeb66e09..09f1118c4d311b0883d3f2574bf5a083d3071829 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -35,7 +35,9 @@ LIBS= \
        ${TOP_LIBDIR}/libbubasics.a \
        ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/opr/liboafs_opr.la \
        $(top_builddir)/src/util/liboafs_util.la

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 4f7bfa136672a80d1feed44d22620b30e1be3fc7..ff667d77be4473540dffa981ccc049c22da3e3d7 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -51,12 +51,13 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${VOLSERLIBS} \
             ${BUTMLIBS} \
            ${TOP_LIBDIR}/libafsauthent.a \
-           ${TOP_LIBDIR}/libafsrpc.a \
+           $(top_builddir)/src/rxkad/liboafs_rxkad.la \
             $(top_builddir)/src/cmd/liboafs_cmd.la \
            $(top_builddir)/src/util/liboafs_util.la \
            $(top_builddir)/src/opr/liboafs_opr.la \
            $(top_builddir)/src/usd/liboafs_usd.la \
            $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+           $(top_builddir)/src/sys/liboafs_sys.la \
            ${TOP_LIBDIR}/libprocmgmt.a
 
 #

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 639817ecb0eeeb2efae0c7be3149eb05ced69a6e..1cede513dd83365253d28770e018e015e76f8aa2 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -30,7 +30,11 @@ INCLS=${TOP_INCDIR}/ubik.h \
 LIBS_common= \
        ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/rx/liboafs_rx.la \
+       $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/util/liboafs_util.la \
        $(top_builddir)/src/opr/liboafs_opr.la

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 6ba6e4d566550f6fd2612ce2d0298b341c4f4528..c6ff2396ae4ec9868be4fc56c3f9ec1a4ec81dda 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -45,7 +45,7 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 
 LIBS=   ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/rx/liboafs_rx.la \
        $(top_builddir)/src/util/liboafs_util.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/lwp/liboafs_lwpcompat.la \

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 9d30c69d686fc90e18c521870c3de12566736a9a..b9641ce211466f42a9a99b23eeb9cc50c97fd35e 100644 (file)
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -23,10 +23,11 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
        ${TOP_INCDIR}/lock.h ubik.h ubik_int.h utst_int.h
 
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
+LIBS=${TOP_LIBDIR}/libafsauthent.a \
+     $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
      $(top_builddir)/src/comerr/liboafs_comerr.la \
      ${top_builddir}/src/cmd/liboafs_cmd.la \
-     ${TOP_LIBDIR}/libsys.a \
+     $(top_builddir)/src/sys/liboafs_sys.la \
      $(top_builddir)/src/util/liboafs_util.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
      ${XLIBS} ${MT_LIBS}

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 3964072431fdbdee0649af586fce4eb566fd20bb..d8fbf8fa140abbdc20b6bc61662730b79b865365 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -26,8 +26,12 @@ INCLS=${TOP_INCDIR}/ubik.h \
 LIBS_common = \
        ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/rx/liboafs_rx.la \
+       $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
-       ${TOP_LIBDIR}/libafsrpc.a \
        $(top_builddir)/src/util/liboafs_util.la \
        ${TOP_LIBDIR}/libaudit.a \
        $(top_builddir)/src/opr/liboafs_opr.la

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index a642146f787a8aa5d73df22f219d964d4d82ea32..8e2c4b42aadcf7b468d2f2a4b6a5ceb86afb4a60 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -41,11 +41,15 @@ vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
        ${VOLOBJS}
 
 LIBS_common = \
+       $(top_builddir)/src/sys/liboafs_sys.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsauthent.a   \
        $(top_builddir)/src/util/liboafs_util.la      \
        $(top_builddir)/src/usd/liboafs_usd.la          \
-       ${TOP_LIBDIR}/libafsrpc.a       \
+       $(top_builddir)/src/rx/liboafs_rx.la \
+       $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
        $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS_client = \

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 3a2560d581823d03db5c544f6d045a7d3ca13579..fc60ccbe237618b448b55c2eec7e1736fa58d0f0 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -26,7 +26,8 @@ AFSIO_INCLS=${TOP_INCDIR}/afs/afsint.h \
 
 AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
        ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+       $(top_builddir)/src/fsint/liboafs_fsint.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/util/liboafs_util.la \
        $(top_builddir)/src/opr/liboafs_opr.la

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 76bc19e1c21c84d7c4dfd0d997208c3ef5d569ec..d4cee44b11d8ccce49b77a50409891dfe54f72b1 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -38,7 +38,10 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
+     $(top_builddir)/src/sys/liboafs_sys.la \
+     $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+     $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+     $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
      $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \