X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=NTMakefile;h=10b5544d15f208a2b0e7c02d579a21604e115f24;hp=8991345abb41e86bae27e4b1df1b00b67cbb6713;hb=81c2416d8e09987ccee9fa5194ab1801c44380df;hpb=7e0b9ba7fc0bc5161d351c7129a5a23650ea7904

diff --git a/NTMakefile b/NTMakefile
index 8991345..10b5544 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -82,13 +82,20 @@ rx_headers:
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
-util_headers:
+util_headers: roken_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\util
 	$(CD) $(SRC)\util
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
+roken_headers:
+     @echo ***** $@
+	$(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..
+
 hcrypto_headers: util_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
@@ -103,7 +110,7 @@ pthread: hcrypto_headers
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-util: procmgmt_headers afsreg_headers lwp_headers rx_headers pthread
+util: procmgmt_headers afsreg_headers lwp_headers rx_headers hcrypto
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -159,21 +166,21 @@ rxgen: lwp
 	$(NTMAKE)
 	$(CD) ..\..
 
-des: rxgen
-     @echo ***** $@
-	$(DOCD) $(SRC)\des
-	$(CD) $(SRC)\des
-	$(NTMAKE)
-	$(CD) ..\..
-
-hcrypto: des
+hcrypto: roken
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
 	$(CD) $(SRC)\crypto\hcrypto
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-rx: hcrypto
+roken: pthread
+     @echo ***** $@
+        $(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
+	$(NTMAKE)
+	$(CD) ..\..
+
+rx: rxgen
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -354,7 +361,21 @@ dir: butm
 	$(NTMAKE)
 	$(CD) ..\..
 
-vol: dir
+libafsrpc: dir
+     @echo ***** $@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+rxtests: libafsrpc
+     @echo ***** $@
+	$(DOCD) $(SRC)\rx\test
+	$(CD) $(SRC)\rx\test
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+vol: rxtests
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -417,14 +438,7 @@ bu_utils: bosctlsvc
 	$(NTMAKE)
 	$(CD) ..\..
 
-libafsrpc: bu_utils
-     @echo ***** $@
-	$(DOCD) $(SRC)\$@
-	$(CD) $(SRC)\$@
-	$(NTMAKE)
-	$(CD) ..\..
-
-libafsauthent: libafsrpc
+libafsauthent: bu_utils
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -473,7 +487,14 @@ talocale: tbutc
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-license: talocale
+talocale_unicode: talocale
+     @echo ***** $@
+	$(DOCD) $(SRC)\WINNT\$@
+	$(CD) $(SRC)\WINNT\$@
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+license: talocale_unicode
      @echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
@@ -680,11 +701,11 @@ install: finale
 # Clean target for obj tree
 clean:
 	$(CD) $(SRC)\config
-	nmake /nologo /f ntmakefile version
+	nmake /nologo /f ntmakefile version langsetup
 	$(CD) ..\..
 	nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" media
 	$(CD) $(SRC)\config
-	nmake /nologo /f ntmakefile clean_version
+	nmake /nologo /f ntmakefile clean_final
 	$(CD) ..\..
 
 # Language-only build target