rxperf: Build again

[openafs.git] / src / rx / test / Makefile.in

diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in
index 4647695..826608d 100644 (file)
--- a/src/rx/test/Makefile.in
+++ b/src/rx/test/Makefile.in
@@ -5,50 +5,31 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-DEST=@DEST@
-TOP_INCDIR=@TOP_INCDIR@
-TOP_LIBDIR=@TOP_LIBDIR@
-TOP_OBJDIR=@TOP_OBJDIR@
 srcdir=@srcdir@
-VPATH=${srcdir}
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-afssrvbindir=@afssrvbindir@
-afssrvsbindir=@afssrvsbindir@
-afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
-RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-MKAFS_OSTYPE=@MKAFS_OSTYPE@
-
-include ../../config/Makefile.${SYS_NAME}
-OPTIMIZE=-g
-
-INCDIRS= -I${TOP_INCDIR} -I.. -I. -I${srcdir} -I${srcdir}/.. -I${TOP_OBJDIR}/src/config 
+include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
+
+
 LDIRS= -L.. -L${TOP_LIBDIR}
 LIBS= ${TOP_LIBDIR}/libcmd.a  ../librx.a ${TOP_LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
 
-CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${XCFLAGS}
+MODULE_CFLAGS=-DRXDEBUG
 
 RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o
 
 BASICINCLS =  ../rx_clock.h ../rx_queue.h ../rx_event.h
 
-LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS}
+LINK = $(AFS_LDRULE) $@.o ${LIBS}
+MT_LINK = $(CC) $(MT_CFLAGS) $(COMMON_CFLAGS) $(AFS_LDFLAGS) -o $@ \
+         $@.o $(TOP_LIBDIR)/libafsrpc.a $(TOP_LIBDIR)/libopr.a \
+         $(LIB_hcrypto) $(LIB_roken) \
+         $(MT_LIBS) $(XLIBS)
 
 TESTS = testclient testserver kstest kctest testqueue tableGen generator
 
 TH_TESTS = th_testserver th_testclient
 
-.IGNORE: 
 
 all: test
 
@@ -57,36 +38,44 @@ test tests: ${TESTS}
 th_test th_tests: ${TH_TESTS}
 
 testclient: ../librx.a testclient.o
-       -${LINK}
+       ${LINK}
 
 testserver: ../librx.a testserver.o
-       -${LINK}
+       ${LINK}
 
 kstest: ../librx.a kstest.o
-       -${LINK}
+       ${LINK}
 
 kctest: ../librx.a kctest.o
-       -${LINK}
+       ${LINK}
+
+rxperf: rxperf.o ../librx.a
+       ${LINK}
 
 # th_ versions only have link lines for Solaris now.
-th_testclient: th_testclient.o ../../libafsrpc/libafsrpc.so 
-       ${CC} ${CFLAGS} -mt -o th_testclient th_testclient.o \
-               ../../libafsrpc/libafsrpc.so -lpthread
+th_testclient: th_testclient.o $(TOP_LIBDIR)/libafsrpc.a
+       $(MT_LINK)
 
 th_testclient.o: testclient.c
-       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testclient.o \
+       $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c -o th_testclient.o \
                ${srcdir}/testclient.c
 
-th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so 
-       ${CC} ${CFLAGS} -mt -o th_testserver th_testserver.o \
-               ../../libafsrpc/libafsrpc.so -lpthread
+th_testserver: th_testserver.o $(TOP_LIBDIR)/libafsrpc.a
+       $(MT_LINK)
 
 th_testserver.o: testserver.c
-       ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testserver.o \
+       $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c -o th_testserver.o \
                ${srcdir}/testserver.c
 
+th_rxperf: th_rxperf.o ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/libopr.a
+       $(MT_LINK)
+
+th_rxperf.o: rxperf.c
+       $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c $(srcdir)/rxperf.c \
+               -o th_rxperf.o
+
 testqueue: ../librx.a testqueue.o
-       -${LINK}
+       ${LINK}
 
 ${RXTESTOBJS}: ${BASICINCLS} ../rx.h