X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=NTMakefile;h=4fae9e88402765617b14e80c484b109649f83629;hp=88102c4e8a7b48076ee50ad72d8a22fb1af6ff4c;hb=2df2de06e5df64f5666316b14d67de7e7c5dae70;hpb=1d7534fb95a8fb77d6b0f3fe0816094b36bde850

diff --git a/NTMakefile b/NTMakefile
index 88102c4..4fae9e8 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: rfc3961
+     @echo ***** $@
+	$(DOCD) $(SRC)\opr
+	$(CD) $(SRC)\opr
+	$(NTMAKE)
+	$(CD) ..\..\..
+
 hcrypto: roken
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
@@ -173,14 +194,21 @@ hcrypto: roken
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-roken: rxgen
+rfc3961: hcrypto
+     @echo ***** $@
+	$(DOCD) $(SRC)\crypto\$@
+	$(CD) $(SRC)\crypto\$@
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+roken: pthread
      @echo ***** $@
         $(DOCD) $(SRC)\roken
 	$(CD) $(SRC)\roken
 	$(NTMAKE)
 	$(CD) ..\..
 
-rx: hcrypto
+rx: rxgen
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -229,7 +257,14 @@ fsint: procmgmt
 	$(NTMAKE)
 	$(CD) ..\..
 
-audit: fsint
+bubasics: fsint
+     @echo ***** $@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+audit: bubasics
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -290,14 +325,14 @@ auth: sys
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
 	$(NTMAKE)
-	$(CD) ..\..	
+	$(CD) ..\..
 
 ubik: auth
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
 	$(NTMAKE)
-	$(CD) ..\..	
+	$(CD) ..\..
 
 ptserver: ubik
      @echo ***** $@
@@ -334,14 +369,7 @@ usd: vlserver
 	$(NTMAKE)
 	$(CD) ..\..
 
-bubasics: usd
-     @echo ***** $@
-	$(DOCD) $(SRC)\$@
-	$(CD) $(SRC)\$@
-	$(NTMAKE)
-	$(CD) ..\..
-
-budb:	bubasics
+budb: usd
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -389,14 +417,7 @@ volser: vol
 	$(NTMAKE)
 	$(CD) ..\..
 
-viced: volser
-     @echo ***** $@
-	$(DOCD) $(SRC)\$@
-	$(CD) $(SRC)\$@
-	$(NTMAKE)
-	$(CD) ..\..
-
-update: viced
+update: volser
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -445,14 +466,14 @@ libafsauthent: bu_utils
 	$(NTMAKE)
 	$(CD) ..\..
 
-tviced: libafsauthent
+viced: libafsauthent
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
 	$(NTMAKE)
 	$(CD) ..\..
 
-tvolser: tviced
+tvolser: viced
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -508,7 +529,7 @@ client_osi: license
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-afsd: client_osi
+afsd: client_osi libafscp
      @echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
@@ -669,14 +690,28 @@ netidmgr_plugin: xstat
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-rpctestlib: fsint libafsrpc
+afsrdr: config
+        echo ***** $@
+        $(DOCD) $(SRC)\WINNT\afsrdr
+        $(CD) $(SRC)\WINNT\afsrdr
+        $(NTMAKE)
+        $(CD) ..\..\..
+
+rpctestlib: config fsint libafsrpc
      @echo ***** $@
 	$(DOCD) $(TESTS)\$@
 	$(CD) $(TESTS)\$@
 	$(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: config
 !	IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      @echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -686,26 +721,33 @@ extra: netidmgr_plugin rpctestlib
 !	ELSE
      @echo ***** Skipping $@ ***** Not found.
 !	ENDIF
-                
-finale: extra
+
+tools: config
+     @echo ***** $@
+	$(DOCD) $(SRC)\tools\rxperf
+	$(CD) $(SRC)\tools\rxperf
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+finale: netidmgr_plugin
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
 	$(NTMAKE)
 	$(CD) ..\..
 
-install: finale
+install: finale afsrdr tools rpctestlib extra
 	@echo Build Finished Successfully
-        
+
 
 # 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
@@ -717,8 +759,8 @@ mkdir:
     -mkdir $(DESTDIR)
     -mkdir $(AFS_OBJDIR)\checked
     -mkdir $(AFS_OBJDIR)\free
-	-xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\ 
-	-xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\ 
+	-xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\
+	-xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\
     -mkdir $(DESTDIR)\checked
 	-mkdir $(DESTDIR)\free
     -mkdir $(DESTDIR)\checked\bin
@@ -779,11 +821,11 @@ wix-lite: loopback man-pages documentation
    $(NTMAKE) LITECLIENT=1
    $(CD) ..\..\..\..
 
-media: install NSIS wix
-
 install-nsis: install NSIS
 
 install-wix: install wix
 
 install-wix-lite: install wix-lite
 
+media: install-wix
+