X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=NTMakefile;h=9222668ed0d7e3bf61bc33014dbcbb016e9f21ee;hp=65c7f1f425d035551b39653915ba05329a4d7e9f;hb=0b510fe30afb34202342364e96bd9030052e1567;hpb=901423b1e566a91b0c10ecb1da1a9886e0877adf

diff --git a/NTMakefile b/NTMakefile
index 65c7f1f..9222668 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -82,14 +82,28 @@ rx_headers:
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
-util_headers:
+util_headers: roken_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\util
 	$(CD) $(SRC)\util
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
-pthread: util_headers
+roken_headers:
+     @echo ***** $@
+	$(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..
+
+hcrypto_headers: util_headers
+     @echo ***** $@
+	$(DOCD) $(SRC)\crypto\hcrypto
+	$(CD) $(SRC)\crypto\hcrypto
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..\..
+
+pthread: hcrypto_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
@@ -152,14 +166,21 @@ rxgen: lwp
 	$(NTMAKE)
 	$(CD) ..\..
 
-des: rxgen
+hcrypto: roken
      @echo ***** $@
-	$(DOCD) $(SRC)\des
-	$(CD) $(SRC)\des
+	$(DOCD) $(SRC)\crypto\hcrypto
+	$(CD) $(SRC)\crypto\hcrypto
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+roken: rxgen
+     @echo ***** $@
+        $(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
 	$(NTMAKE)
 	$(CD) ..\..
 
-rx: des
+rx: hcrypto
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -340,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)\$@
@@ -403,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)\$@
@@ -459,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\$@
@@ -666,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