util: Convert to using libtool

[openafs.git] / tests / rpctestlib / Makefile.in

diff --git a/tests/rpctestlib/Makefile.in b/tests/rpctestlib/Makefile.in
index 5f820bf..489325f 100644 (file)
--- a/tests/rpctestlib/Makefile.in
+++ b/tests/rpctestlib/Makefile.in
@@ -11,11 +11,9 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-
 RTL=@TOP_OBJDIR@/tests/rpctestlib
-RX=@TOP_OBJDIR@/src/rx
+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
@@ -35,13 +33,15 @@ RXOBJS = rx_pthread.o
 
 LIBOBJS= ${RTLOBJS} ${FSINTOBJS} ${RXOBJS}
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.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
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
 
 rx_pthread.o: ${RX}/rx_pthread.c
+       $(AFS_CCRULE) $(RX)/rx_pthread.c
 
 rpc_test_main.o: ${RTL}/rpc_test_main.c ${headers}
 rpc_test_procs.o: ${RTL}/rpc_test_procs.c ${headers}
@@ -49,15 +49,21 @@ rpc_test_cb_procs.o: ${RTL}/rpc_test_cb_procs.c ${headers}
 
 CFLAGS_afsaux.o = -I{FSINT}
 afsaux.o: ${FSINT}/afsaux.c
+       $(AFS_CCRULE) ${FSINT}/afsaux.c
 afscbint.ss.o: ${FSINT}/afscbint.ss.c
+       $(AFS_CCRULE) ${FSINT}/afscbint.ss.c
 afsint.cs.o: ${FSINT}/afsint.cs.c
+       $(AFS_CCRULE) ${FSINT}/afsint.cs.c
 afsint.ss.o: ${FSINT}/afsint.ss.c
+       $(AFS_CCRULE) ${FSINT}/afsint.ss.c
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
+       $(AFS_CCRULE) ${FSINT}/afsint.xdr.c
 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} ${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 $@
@@ -69,6 +75,7 @@ install:
 dest:
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a *.gch xmpl_driver core
 
 include @TOP_OBJDIR@/src/config/Makefile.version