From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 2 Feb 2008 00:20:07 +0000 (+0000)
Subject: DEVEL15-windows-build-system-20080201
X-Git-Tag: openafs-devel-1_5_31~44
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8b83bf92b626c9ec8cb993af92d615a3f9f83b07;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-build-system-20080201

LICENSE MIT

re-order the building of directories so that libafsconf.dll is built
before other directories that might want to use it.


(cherry picked from commit f224734230f6bfd27f1a1dfa159d1f38797c7999)
---

diff --git a/src/NTMakefile b/src/NTMakefile
index a7fda99d2..265e6a232 100644
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -409,14 +409,7 @@ tbutc:  tviced
      $(NTMAKE)
      $(CD) ..\..
 
-libadmin: tbutc
-     echo ***** $@
-	$(DOCD) $(SRC)\$@
-	$(CD) $(SRC)\$@
-	$(NTMAKE)
-	$(CD) ..\..
-
-adminutil: libadmin
+adminutil: tbutc
      echo ***** $@
 	$(DOCD) $(SRC)\libadmin\$@
 	$(CD) $(SRC)\libadmin\$@
@@ -458,49 +451,56 @@ bos: pts
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-cfg: bos
+talocale: bos
      echo ***** $@
-	$(DOCD) $(SRC)\libadmin\$@
-	$(CD) $(SRC)\libadmin\$@
+	$(DOCD) $(SRC)\WINNT\$@
+	$(CD) $(SRC)\WINNT\$@
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-admintest: cfg
+license: talocale
      echo ***** $@
-	$(DOCD) $(SRC)\libadmin\test
-	$(CD) $(SRC)\libadmin\test
+	$(DOCD) $(SRC)\WINNT\$@
+	$(CD) $(SRC)\WINNT\$@
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-talocale: admintest
+client_osi: license
      echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-license: talocale
+afsd: client_osi
      echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-client_osi: license
+libadmin: afsd
      echo ***** $@
-	$(DOCD) $(SRC)\WINNT\$@
-	$(CD) $(SRC)\WINNT\$@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+cfg: bos
+     echo ***** $@
+	$(DOCD) $(SRC)\libadmin\$@
+	$(CD) $(SRC)\libadmin\$@
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-afsd: client_osi
+admintest: cfg
      echo ***** $@
-	$(DOCD) $(SRC)\WINNT\$@
-	$(CD) $(SRC)\WINNT\$@
+	$(DOCD) $(SRC)\libadmin\test
+	$(CD) $(SRC)\libadmin\test
 	$(NTMAKE)
 	$(CD) ..\..\..
 
-afsadmsvr: afsd
+afsadmsvr: admintest
      echo ***** $@
 	$(DOCD) $(SRC)\WINNT\$@
 	$(CD) $(SRC)\WINNT\$@