DEVEL15-windows-build-20080815

[openafs.git] / src / NTMakefile

diff --git a/src/NTMakefile b/src/NTMakefile
index 4896cfc..86d2310 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -18,6 +18,7 @@
 
 # These three macros define the source, object, and destination folders
 SRC=$(AFSROOT)\src
+DOC=$(AFSROOT)\doc
 
 #If AFS_OBJDIR is not defined then use obj as relative obj folder
 !IFNDEF AFS_OBJDIR
@@ -46,7 +47,7 @@ config:
        $(NTMAKE)
        $(CD) ..\..
 
-procmgmt_headers:config
+procmgmt_headers: config
      echo ***** $@
        $(DOCD) $(SRC)\procmgmt
        $(CD) $(SRC)\procmgmt
@@ -60,7 +61,14 @@ afsreg_headers:
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
-util: procmgmt_headers afsreg_headers
+lwp_headers:
+     echo ***** $@
+       $(DOCD) $(SRC)\lwp
+       $(CD) $(SRC)\lwp
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
+util: procmgmt_headers afsreg_headers lwp_headers
      echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -137,7 +145,14 @@ rx: des
        $(NTMAKE)
        $(CD) ..\..
 
-ubik_headers: rx
+rxdebug: rx
+     echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+ubik_headers: rxdebug
      echo ***** $@
        $(DOCD) $(SRC)\ubik
        $(CD) $(SRC)\ubik
@@ -402,7 +417,35 @@ tbutc:  tviced
      $(NTMAKE)
      $(CD) ..\..
 
-libadmin: tbutc
+talocale: tbutc
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+license: talocale
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+client_osi: license
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+afsd: client_osi
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+libadmin: afsd
      echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -465,35 +508,7 @@ admintest: cfg
        $(NTMAKE)
        $(CD) ..\..\..
 
-talocale: admintest
-     echo ***** $@
-       $(DOCD) $(SRC)\WINNT\$@
-       $(CD) $(SRC)\WINNT\$@
-       $(NTMAKE)
-       $(CD) ..\..\..
-
-license: talocale
-     echo ***** $@
-       $(DOCD) $(SRC)\WINNT\$@
-       $(CD) $(SRC)\WINNT\$@
-       $(NTMAKE)
-       $(CD) ..\..\..
-
-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
+afsadmsvr: admintest
      echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -570,7 +585,21 @@ aklog: client_creds
        $(NTMAKE)
        $(CD) ..\..\..
 
-extra: aklog
+xstat: aklog
+     echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+netidmgr_plugin: xstat
+     echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+extra: netidmgr_plugin
 !      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -586,12 +615,11 @@ finale: extra
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..     
-       echo Build Finished Successfully
+       $(CD) ..\..
 
 install: finale
-
-# InstallShield dependencies
+       echo Build Finished Successfully
+        
 
 # Clean target for obj tree
 clean:
@@ -625,37 +653,31 @@ loopback:
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-NSIS: loopback
+man-pages: 
+   echo ***** $@
+   $(DOCD) $(DOC)\man-pages
+   $(CD) $(DOC)\man-pages
+   $(NTMAKE)
+   $(CD) ..\..
+
+NSIS: loopback man-pages
    echo ***** Making NSIS Installer
    $(DOCD) $(SRC)\WINNT\install\$@
    $(CD) $(SRC)\WINNT\install\$@
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-wix: loopback
+wix: loopback man-pages
    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
+media: install man-pages NSIS wix
 
-install-nsis: install NSIS
+install-nsis: install man-pages NSIS
 
-install-wix: install wix
+install-wix: install man-pages wix
 
-install-is5: install InstallShield5