From 985a62bcf1a3315ce0460f64e56fa667a4268f1b Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 19 Nov 2009 14:18:18 -0500
Subject: [PATCH] Windows: modify src/rxkad/NTMakefile to avoid file copies

Permit src/rxkad/domestic/* files to be compiled / installed
in place.  This permits the tree to build after the
application of change I0796fabcf83ffcd74e533624c64e138a160dd632.

Change-Id: I5616c7ab9374751dcb44bb2bce37dec40e01148a
Reviewed-on: http://gerrit.openafs.org/854
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/rxkad/.gitignore |  4 ----
 src/rxkad/NTMakefile | 28 +++++++++++++---------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/rxkad/.gitignore b/src/rxkad/.gitignore
index 4bd986822..5fcd2d702 100644
--- a/src/rxkad/.gitignore
+++ b/src/rxkad/.gitignore
@@ -2,10 +2,6 @@
 #     git ls-files -i --exclude-standard
 # to check that you haven't inadvertently ignored any tracked files.
 
-/crypt_conn.c
-/fcrypt.c
-/fcrypt.h
 /rxkad.h
 /rxkad_errs.c
-/sboxes.h
 /fc_test
diff --git a/src/rxkad/NTMakefile b/src/rxkad/NTMakefile
index 83844d6a4..1797072f6 100644
--- a/src/rxkad/NTMakefile
+++ b/src/rxkad/NTMakefile
@@ -13,12 +13,11 @@ INCFILEDIR = $(DESTDIR)\include\rx  # header file install directory
 
 INCFILES =\
 	$(INCFILEDIR)\rxkad_prototypes.h \
-	$(INCFILEDIR)\fcrypt.h \
 	$(INCFILEDIR)\asn1_err.h \
-    $(INCFILEDIR)\v5gen.h \
-    $(INCFILEDIR)\hash.h\
-    $(INCFILEDIR)\md4.h \
-    $(INCFILEDIR)\md5.h \
+        $(INCFILEDIR)\v5gen.h \
+        $(INCFILEDIR)\hash.h\
+        $(INCFILEDIR)\md4.h \
+        $(INCFILEDIR)\md5.h \
 	$(INCFILEDIR)\rxkad.h
 
 # build afsrxkad.lib
@@ -32,8 +31,8 @@ LIBOBJS =\
 	$(OUT)\bg-fcrypt.obj \
 	$(OUT)\ticket5.obj \
 	$(OUT)\crc.obj \
-    $(OUT)\md4.obj \
-    $(OUT)\md5.obj \
+        $(OUT)\md4.obj \
+        $(OUT)\md5.obj \
 	$(OUT)\crypt_conn.obj 
 
 $(LIBOBJS):
@@ -48,25 +47,24 @@ $(LIBFILE): $(LIBOBJS)
 
 $(INCFILES):$$(@F)
 	 $(COPY)  $** $(INCFILEDIR)\.
+	 $(COPY)  domestic\fcrypt.h $(INCFILEDIR)\.
 
 rxkad.h rxkad_errs.c : rxkad_errs.et rxkad.p.h
 	$(DEL) rxkad_errs.c 
 	$(COMPILE_ET) rxkad_errs -h rxkad
 
-# These sources are kept in a separate directory so that we can use an
-# ACL to comply with source export restrictions.
+$(OUT)\fcrypt.obj: DOMESTIC\fcrypt.c DOMESTIC\fcrypt.h DOMESTIC\sboxes.h DOMESTIC\rxkad.h DOMESTIC\rxkad_prototypes.h
+	$(C2OBJ) DOMESTIC\fcrypt.c
 
-DOMESTIC = crypt_conn.c fcrypt.c fcrypt.h sboxes.h
+$(OUT)\crypt_conn.obj: DOMESTIC\crypt_conn.c DOMESTIC\fcrypt.h private_data.h
+	$(C2OBJ) DOMESTIC\crypt_conn.c
 
-$(DOMESTIC):domestic\$$@
-	$(COPY)  $** .
-
-install: $(DOMESTIC) $(INCFILES) $(LIBFILE)
+install: $(INCFILES) $(LIBFILE)
 
 install9x: install
 
 clean::
-	$(DEL) $(RXKAD_INCFILE) rxkad_errs.c $(INCFILES)
+	$(DEL) rxkad.h rxkad_errs.c $(INCFILES) $(INCFILEDIR)\fcrypt.h
 	$(DEL) $(LIBFILE)
 
 mkdir:
-- 
2.39.5