windows-makefile-20050509

[openafs.git] / src / NTMakefile

diff --git a/src/NTMakefile b/src/NTMakefile
index 62c19b3..af94461 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -204,7 +204,14 @@ auth_headers: cm_headers
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-afsdobjs: auth_headers
+vlserver_headers: auth_headers
+     echo ***** $@
+       $(DOCD) $(SRC)\vlserver
+       $(CD) $(SRC)\vlserver
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
+afsdobjs: vlserver_headers
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\afsd
        $(CD) $(SRC)\WINNT\afsd
@@ -462,63 +469,63 @@ license: talocale
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsadmsvr: license
+client_osi: license
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsusrmgr: afsadmsvr
+afsd: client_osi
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afssvrmgr: afsusrmgr
+afsadmsvr: afsd
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afssvrcfg: afssvrmgr
+afsusrmgr: afsadmsvr
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afssvrcpa: afssvrcfg
+afssvrmgr: afsusrmgr
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_talocale: afssvrcpa
+afssvrcfg: afssvrmgr
      echo ***** $@
-       $(DOCD) $(SRC)\WINNT\talocale
-       $(CD) $(SRC)\WINNT\talocale
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_osi: client_talocale
+afssvrcpa: afssvrcfg
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsd: client_osi
+client_talocale: afssvrcpa
      echo ***** $@
-       $(DOCD) $(SRC)\WINNT\$@
-       $(CD) $(SRC)\WINNT\$@
+       $(DOCD) $(SRC)\WINNT\talocale
+       $(CD) $(SRC)\WINNT\talocale
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_cpa: afsd
+client_cpa: client_talocale
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -601,19 +608,26 @@ mkdir:
        -mkdir $(DESTDIR)\free\bin
        -@copy $(SRC)\config\NTLANG.BAT .
 
-NSIS:
+loopback:
+   echo ***** Making Loopback Adapter Utility DLL
+   $(DOCD) $(SRC)\WINNT\install\$@
+   $(CD) $(SRC)\WINNT\install\$@
+   $(NTMAKE)
+   $(CD) ..\..\..\..
+
+NSIS: loopback
    echo ***** Making NSIS Installer
    $(DOCD) $(SRC)\WINNT\install\$@
    $(CD) $(SRC)\WINNT\install\$@
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-#msi:
-#   echo ***** Making MSI Installer
-#   $(DOCD) $(SRC)\WINNT\install\$@
-#   $(CD) $(SRC)\WINNT\install\$@
-#   $(NTMAKE)
-#   $(CD) ..\..\..\..
+wix: loopback
+   echo ***** Making Wix MSI Installer
+   $(DOCD) $(SRC)\WINNT\install\$@
+   $(CD) $(SRC)\WINNT\install\$@
+   $(NTMAKE)
+   $(CD) ..\..\..\..
 
 InstallShield5:
        echo ***** afs_setup_utils
@@ -627,11 +641,11 @@ InstallShield5:
        $(NTMAKE)
        $(CD) ..\..\..\..
 
-media: install InstallShield5 NSIS
+media: install InstallShield5 NSIS wix
 
 install-nsis: install NSIS
 
-install-msi: install msi
+install-wix: install wix
 
 install-is5: install InstallShield5