From 33fe4bd1301beab6f97bb00ea1110646583f15c3 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Tue, 7 Dec 2004 05:49:33 +0000
Subject: [PATCH] STABLE14-update-objdir-20041110

make objdir builds work (with fix from shadow@dementia.org in src/rxkad/...)


(cherry picked from commit fbec56963df5d556056e4da37c3b6468a1ca69c5)
---
 src/des/Makefile.in       |  6 +++---
 src/libafsrpc/Makefile.in |  8 ++++----
 src/rxkad/Makefile.in     | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index a415f1470..c3c5013d7 100644
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -85,12 +85,12 @@ make_p:	make_p.o misc.o main.o
 make_s:	make_s.o misc.o main.o 
 	${CC} make_s.o misc.o main.o ${LDFLAGS} -o make_s
 
-crypt.o: crypt.c
+crypt.o: ${srcdir}/crypt.c
 	case ${SYS_NAME} in \
 	rs_aix*)\
-		${CCOBJ} -c ${COMMON_INCL} -o crypt.o crypt.c ;;\
+		${CCOBJ} -c ${COMMON_INCL} -o crypt.o ${srcdir}/crypt.c ;;\
 	*)\
-		${CCOBJ} -c ${CFLAGS} -o crypt.o crypt.c ;;\
+		${CCOBJ} -c ${CFLAGS} -o crypt.o ${srcdir}/crypt.c ;;\
 	esac
 #
 # Table/code generation targets
diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index ff2f2639f..4ff1ed871 100644
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -202,11 +202,11 @@ md4.o: ${RXKAD}/md4.c
 md5.o: ${RXKAD}/md5.c
 	${CCRULE} ${RXKAD}/md5.c
 
-fcrypt.o: ${TOP_OBJDIR}/src/rxkad/domestic/fcrypt.c
-	${CCRULE} ${TOP_OBJDIR}/src/rxkad/domestic/fcrypt.c
+fcrypt.o: ${TOP_SRCDIR}/src/rxkad/domestic/fcrypt.c
+	${CCRULE} ${TOP_SRCDIR}/src/rxkad/domestic/fcrypt.c
 
-crypt_conn.o: ${TOP_OBJDIR}/src/rxkad/domestic/crypt_conn.c
-	${CCRULE} ${TOP_OBJDIR}/src/rxkad/domestic/crypt_conn.c
+crypt_conn.o: ${TOP_SRCDIR}/src/rxkad/domestic/crypt_conn.c
+	${CCRULE} ${TOP_SRCDIR}/src/rxkad/domestic/crypt_conn.c
 
 AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
 	${CCRULE} ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index c19ae6854..e830edfa4 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -87,14 +87,14 @@ md4.o: md4.c ${INCLS}
  
 md5.o: md5.c ${INCLS}
 
-fcrypt.o: domestic/fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
-	${CCOBJ} ${CFLAGS} -c domestic/fcrypt.c
+fcrypt.o: ${srcdir}/domestic/fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
+	${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/fcrypt.c
 
-crypt_conn.o: domestic/crypt_conn.c fcrypt.h private_data.h ${INCLS}
-	${CCOBJ} ${CFLAGS} -c domestic/crypt_conn.c
+crypt_conn.o: ${srcdir}/domestic/crypt_conn.c fcrypt.h private_data.h ${INCLS}
+	${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/crypt_conn.c
 
-tcrypt.o: domestic/tcrypt.c AFS_component_version_number.o
-	${CCOBJ} ${CFLAGS} -c domestic/fcrypt.c
+tcrypt.o: ${srcdir}/domestic/tcrypt.c AFS_component_version_number.o
+	${CCOBJ} ${CFLAGS} -c ${srcdir}/domestic/fcrypt.c
 
 tcrypt: tcrypt.o librxkad.a 
 	${CC} -o tcrypt tcrypt.o librxkad.a
-- 
2.39.5