windows-makefile-20050509

[openafs.git] / src / NTMakefile

diff --git a/src/NTMakefile b/src/NTMakefile
index 9315e20..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,27 +197,41 @@ cm_headers: libacl_headers
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
-sys: cm_headers
+auth_headers: cm_headers
      echo ***** $@
-       $(DOCD) $(SRC)\$@
-       $(CD) $(SRC)\$@
-       $(NTMAKE)
+       $(DOCD) $(SRC)\auth
+       $(CD) $(SRC)\auth
+       $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-afsdobjs: sys
+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
        $(NTMAKE_OBJS)
        $(CD) ..\..\..
 
-auth: afsdobjs
+sys: afsdobjs
      echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
+auth: sys
+     echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..     
+
 ubik: auth
      echo ***** $@
        $(DOCD) $(SRC)\$@
@@ -453,7 +469,21 @@ license: talocale
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsadmsvr: license
+client_osi: license
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+afsd: client_osi
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+afsadmsvr: afsd
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -495,49 +525,53 @@ client_talocale: afssvrcpa
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_osi: client_talocale
+client_cpa: client_talocale
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsd: client_osi
+client_config: client_cpa
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_cpa: afsd
+client_exp: client_config
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_config: client_cpa
+client_creds: client_exp
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_exp: client_config
+aklog: client_creds
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
-client_creds: client_exp
+extra: aklog
+!      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      echo ***** $@
-       $(DOCD) $(SRC)\WINNT\$@
+    $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
-
-finale: client_creds
+!      ELSE
+     echo ***** Skipping $@ ***** Not found.
+!      ENDIF
+                
+finale: extra
      echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -549,20 +583,6 @@ install: finale
 
 # InstallShield dependencies
 
-InstallShield5:
-       echo ***** afs_setup_utils
-       $(DOCD) $(SRC)\WINNT\afs_setup_utils
-       $(CD) $(SRC)\WINNT\afs_setup_utils
-       $(NTMAKE)
-       $(CD) ..\..\..
-
-       $(DOCD) $(SRC)\WINNT\install\$@
-       $(CD) $(SRC)\WINNT\install\$@
-       $(NTMAKE)
-       $(CD) ..\..\..\..
-
-media: InstallShield5 NSIS
-
 # Clean target for obj tree
 clean:
        nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" install
@@ -576,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
@@ -584,10 +608,44 @@ 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\NSIS
-   $(CD) $(SRC)\WINNT\install\NSIS
+   $(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
+       $(DOCD) $(SRC)\WINNT\afs_setup_utils
+       $(CD) $(SRC)\WINNT\afs_setup_utils
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+       $(DOCD) $(SRC)\WINNT\install\$@
+       $(CD) $(SRC)\WINNT\install\$@
+       $(NTMAKE)
+       $(CD) ..\..\..\..
+
+media: install InstallShield5 NSIS wix
+
+install-nsis: install NSIS
+
+install-wix: install wix
+
+install-is5: install InstallShield5
+