STABLE14-update-objdir-20041110

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

(cherry picked from commit fbec56963df5d556056e4da37c3b6468a1ca69c5)

diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index a415f1470f926ccf651c421468b764b6a647f8cd..c3c5013d70d821b563748402d805dee5039f4b4e 100644 (file)
--- 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 ff2f2639f56cc335969f3930eab255a63618a299..4ff1ed8715c61a9ffeb43e1551923f72b520b9bf 100644 (file)
--- 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 c19ae6854ff12b1499871b6073c60403d1c9de25..e830edfa40fe68197dfdc665ec4a76412e463869 100644 (file)
--- 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