windows-makefile-20050509

[openafs.git] / src / NTMakefile

diff --git a/src/NTMakefile b/src/NTMakefile
index a8bdef5..af94461 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -22,7 +22,9 @@ SRC=$(AFSROOT)\src
 !IFNDEF AFS_OBJDIR
 AFS_OBJDIR=$(AFSROOT)\obj
 !ENDIF
+!IFNDEF DESTDIR
 DESTDIR=$(AFSROOT)\dest
+!ENDIF
 
 CD = cd
 NTMAKE = nmake /nologo /f ntmakefile install
@@ -195,7 +197,21 @@ cm_headers: libacl_headers
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
-afsdobjs: cm_headers
+auth_headers: cm_headers
+     echo ***** $@
+       $(DOCD) $(SRC)\auth
+       $(CD) $(SRC)\auth
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
+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
@@ -214,7 +230,7 @@ auth: sys
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..
+       $(CD) ..\..     
 
 ubik: auth
      echo ***** $@
@@ -453,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\$@
@@ -537,7 +553,14 @@ client_creds: client_exp
        $(NTMAKE)
        $(CD) ..\..\..
 
-extra: client_creds
+aklog: client_creds
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+extra: aklog
 !      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -573,6 +596,10 @@ lang:
     nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile lang" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile lang" install
 
 mkdir:
+    -mkdir $(AFS_OBJDIR)
+    -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\ 
     -mkdir $(DESTDIR)\checked
@@ -581,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
@@ -607,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