Fix some configure header prereqs

[openafs.git] / NTMakefile

diff --git a/NTMakefile b/NTMakefile
index 409063f..c3a6544 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -82,21 +82,35 @@ 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\$@
        $(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)\$@
@@ -152,14 +166,21 @@ rxgen: lwp
        $(NTMAKE)
        $(CD) ..\..
 
-des: rxgen
+hcrypto: roken
+     @echo ***** $@
+       $(DOCD) $(SRC)\crypto\hcrypto
+       $(CD) $(SRC)\crypto\hcrypto
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+roken: pthread
      @echo ***** $@
-       $(DOCD) $(SRC)\des
-       $(CD) $(SRC)\des
+        $(DOCD) $(SRC)\roken
+       $(CD) $(SRC)\roken
        $(NTMAKE)
        $(CD) ..\..
 
-rx: des
+rx: rxgen
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -283,7 +304,7 @@ ptserver: ubik
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..     
+       $(CD) ..\..
 
 libacl: ptserver
      @echo ***** $@
@@ -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,35 +438,42 @@ bu_utils: bosctlsvc
        $(NTMAKE)
        $(CD) ..\..
 
-libafsrpc: bu_utils
+libafsauthent: bu_utils
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-libafsauthent: libafsrpc
+tviced: libafsauthent
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tviced: libafsauthent
+tvolser: tviced
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tvolser: tviced
+dviced: tvolser
+     @echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+dvolser: dviced
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tbutc:  tvolser
+tbutc:  dvolser
      @echo ***** $@
      $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
@@ -445,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\$@
@@ -459,7 +508,7 @@ client_osi: license
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsd: client_osi
+afsd: client_osi libafscp
      @echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -627,6 +676,13 @@ rpctestlib: fsint libafsrpc
        $(NTMAKE)
        $(CD) ..\..
 
+libafscp: util afs volser vlserver rx auth fsint afsdobjs
+     @echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
 extra: netidmgr_plugin rpctestlib
 !      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      @echo ***** $@
@@ -652,11 +708,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