From 2f4ec2cfaa646f4e56a3d79a538ed51d9044a5f9 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Fri, 26 Oct 2001 04:49:11 +0000
Subject: [PATCH] rx-test-srcdir-support-20011025

continuing srcdir support for objdir builds`
---
 src/rx/test/Makefile.in | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in
index 29ed54273..464769587 100644
--- a/src/rx/test/Makefile.in
+++ b/src/rx/test/Makefile.in
@@ -5,21 +5,38 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
+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${DESTDIR}/include -I.. 
-LDIRS= -L.. -L${DESTDIR}/lib -L${DESTDIR}/lib/afs  
-LIBS= ${DESTDIR}/lib/afs/libcmd.a  ../librx.a ${DESTDIR}/lib/liblwp.a \
-	 ${DESTDIR}/lib/util.a ${DESTDIR}/lib/afs/libsys.a ${XLIBS}
+INCDIRS= -I${TOP_INCDIR} -I.. -I. -I${srcdir} -I${srcdir}/.. -I${TOP_OBJDIR}/src/config 
+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} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${XCFLAGS}
 
 RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o
 
@@ -58,7 +75,7 @@ th_testclient: th_testclient.o ../../libafsrpc/libafsrpc.so
 
 th_testclient.o: testclient.c
 	${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testclient.o \
-		testclient.c
+		${srcdir}/testclient.c
 
 th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so 
 	${CC} ${CFLAGS} -mt -o th_testserver th_testserver.o \
@@ -66,7 +83,7 @@ th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so
 
 th_testserver.o: testserver.c
 	${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testserver.o \
-		testserver.c
+		${srcdir}/testserver.c
 
 testqueue: ../librx.a testqueue.o
 	-${LINK}
-- 
2.39.5