From: Jim Rees <rees@umich.edu>
Date: Wed, 13 Oct 2004 02:10:58 +0000 (+0000)
Subject: build-fcrypt-from-domestic-20041010
X-Git-Tag: BP-disconnected~214
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=2fb7971aa120a92d1cf58c3940f85f7a7b3d091f

build-fcrypt-from-domestic-20041010


don't install rxkad/domestic/*.c, just compile them where they live
---

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 435b106..ff2f263 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/fcrypt.c
-	${CCRULE} ${TOP_OBJDIR}/src/rxkad/fcrypt.c
+fcrypt.o: ${TOP_OBJDIR}/src/rxkad/domestic/fcrypt.c
+	${CCRULE} ${TOP_OBJDIR}/src/rxkad/domestic/fcrypt.c
 
-crypt_conn.o: ${TOP_OBJDIR}/src/rxkad/crypt_conn.c
-	${CCRULE} ${TOP_OBJDIR}/src/rxkad/crypt_conn.c
+crypt_conn.o: ${TOP_OBJDIR}/src/rxkad/domestic/crypt_conn.c
+	${CCRULE} ${TOP_OBJDIR}/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 40d1b6fe..c19ae68 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -65,8 +65,6 @@ librxkad.a: ${OBJS} AFS_component_version_number.o
 	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
 	$(RANLIB) $@
 
-crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS}
-
 rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
 
 rxkad_server.o: fcrypt.h private_data.h rxkad_server.c ${INCLS}
@@ -89,14 +87,18 @@ md4.o: md4.c ${INCLS}
  
 md5.o: md5.c ${INCLS}
 
-fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
-	${CCOBJ} ${CFLAGS} -c fcrypt.c
+fcrypt.o: domestic/fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
+	${CCOBJ} ${CFLAGS} -c domestic/fcrypt.c
+
+crypt_conn.o: domestic/crypt_conn.c fcrypt.h private_data.h ${INCLS}
+	${CCOBJ} ${CFLAGS} -c domestic/crypt_conn.c
+
+tcrypt.o: domestic/tcrypt.c AFS_component_version_number.o
+	${CCOBJ} ${CFLAGS} -c domestic/fcrypt.c
 
 tcrypt: tcrypt.o librxkad.a 
 	${CC} -o tcrypt tcrypt.o librxkad.a
 
-tcrypt.o: tcrypt.c AFS_component_version_number.o
-
 fc_test: ${fc_test_OBJS} ${fc_test_LIBS}
 	${CC} ${CFLAGS} -o fc_test ${fc_test_OBJS} ${fc_test_LIBS} ${XLIBS}
 
@@ -109,7 +111,7 @@ fc_test.o: ${INCLS}
 clean: 
 	$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
 		AFS_component_version_number.c \
-		crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
+		fcrypt.h sboxes.h \
 		fc_test
 
 test:
@@ -117,21 +119,12 @@ test:
 # These sources are kept in a separate directory so that we can use an
 # ACL to comply with source export restrictions.
 
-crypt_conn.c: domestic/crypt_conn.c
-	${INSTALL} $? $@
-
-fcrypt.c: domestic/fcrypt.c
-	${INSTALL} $? $@
-
 fcrypt.h: domestic/fcrypt.h
 	${INSTALL} $? $@
 
 sboxes.h: domestic/sboxes.h
 	${INSTALL} $? $@
 
-tcrypt.c: domestic/tcrypt.c
-	${INSTALL} $? $@
-
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/librxkad.a: librxkad.a
 	${INSTALL} $? $@
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 2c4b550..675f7a4 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -209,10 +209,10 @@ md4.o: ${RXKAD}/md4.c
 md5.o: ${RXKAD}/md5.c
 	${CCRULE}
 
-fcrypt.o: ${RXKAD}/fcrypt.c
+fcrypt.o: ${RXKAD}/domestic/fcrypt.c
 	${CCRULE}
 
-crypt_conn.o: ${RXKAD}/crypt_conn.c
+crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
 	${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c