X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=NTMakefile;h=d96c8840f3f19091076b37da3f01a9f07e1ee669;hp=618b3bb4d21b26e01568a7d3bd0bf4acb6d595a8;hb=1379fb6de4d2134160fcc95cbbee4bd6048eaeaa;hpb=ea622b0967788801ce2f532a768aaad6267ef37b

diff --git a/NTMakefile b/NTMakefile
index 618b3bb..d96c884 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -68,6 +68,13 @@ afsreg_headers:
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..\..
 
+libafscp_headers:
+     @echo ***** $@
+	$(DOCD) $(SRC)\libafscp
+	$(CD) $(SRC)\libafscp
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..\..
+
 lwp_headers:
      @echo ***** $@
 	$(DOCD) $(SRC)\lwp
@@ -82,13 +89,20 @@ rx_headers:
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
-util_headers: roken_headers
+util_headers: opr_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\util
 	$(CD) $(SRC)\util
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
+opr_headers: roken_headers
+     @echo ***** $@
+	$(DOCD) $(SRC)\opr
+	$(CD) $(SRC)\opr
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..
+
 roken_headers:
      @echo ***** $@
 	$(DOCD) $(SRC)\roken
@@ -110,7 +124,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 opr
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -166,6 +180,13 @@ rxgen: lwp
 	$(NTMAKE)
 	$(CD) ..\..
 
+opr: hcrypto
+     @echo ***** $@
+	$(DOCD) $(SRC)\opr
+	$(CD) $(SRC)\opr
+	$(NTMAKE)
+	$(CD) ..\..\..
+
 hcrypto: roken
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
@@ -173,14 +194,14 @@ hcrypto: roken
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-roken: rxgen
+roken: pthread
      @echo ***** $@
         $(DOCD) $(SRC)\roken
 	$(CD) $(SRC)\roken
 	$(NTMAKE)
 	$(CD) ..\..
 
-rx: hcrypto
+rx: rxgen
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -487,7 +508,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\$@
@@ -501,7 +529,7 @@ client_osi: license
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-afsd: client_osi
+afsd: client_osi libafscp
      @echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
@@ -662,6 +690,13 @@ netidmgr_plugin: xstat
 	$(NTMAKE)
 	$(CD) ..\..\..
 
+afsrdr: netidmgr_plugin
+        echo ***** $@
+        $(DOCD) $(SRC)\WINNT\afsrdr
+        $(CD) $(SRC)\WINNT\afsrdr
+        $(NTMAKE)
+        $(CD) ..\..\..
+
 rpctestlib: fsint libafsrpc
      @echo ***** $@
 	$(DOCD) $(TESTS)\$@
@@ -669,7 +704,14 @@ rpctestlib: fsint libafsrpc
 	$(NTMAKE)
 	$(CD) ..\..
 
-extra: netidmgr_plugin rpctestlib
+libafscp: libafscp_headers util afs volser vlserver rx auth fsint afsdobjs
+     @echo ***** $@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+extra: afsrdr rpctestlib
 !	IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      @echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -694,11 +736,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