fs getfid defaults to '.', like other path-related commands

[openafs.git] / NTMakefile

diff --git a/NTMakefile b/NTMakefile
index dd6e1df..a46dec2 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -19,6 +19,7 @@
 # These three macros define the source, object, and destination folders
 SRC=$(AFSROOT)\src
 DOC=$(AFSROOT)\doc
+TESTS=$(AFSROOT)\tests
 
 #If AFS_OBJDIR is not defined then use obj as relative obj folder
 !IFNDEF AFS_OBJDIR
@@ -88,7 +89,14 @@ util_headers:
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-pthread: util_headers
+hcrypto_headers: util_headers
+     @echo ***** $@
+       $(DOCD) $(SRC)\crypto\hcrypto
+       $(CD) $(SRC)\crypto\hcrypto
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..\..
+
+pthread: hcrypto_headers
      @echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -158,7 +166,14 @@ des: rxgen
        $(NTMAKE)
        $(CD) ..\..
 
-rx: des
+hcrypto: des
+     @echo ***** $@
+       $(DOCD) $(SRC)\crypto\hcrypto
+       $(CD) $(SRC)\crypto\hcrypto
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+rx: hcrypto
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -282,7 +297,7 @@ ptserver: ubik
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..     
+       $(CD) ..\..
 
 libacl: ptserver
      @echo ***** $@
@@ -339,7 +354,14 @@ dir: butm
        $(NTMAKE)
        $(CD) ..\..
 
-vol: dir
+libafsrpc: dir
+     @echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+vol: libafsrpc
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -402,35 +424,42 @@ bu_utils: bosctlsvc
        $(NTMAKE)
        $(CD) ..\..
 
-libafsrpc: bu_utils
+libafsauthent: bu_utils
+     @echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+tviced: libafsauthent
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-libafsauthent: libafsrpc
+tvolser: tviced
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tviced: libafsauthent
+dviced: tvolser
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tvolser: tviced
+dvolser: dviced
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tbutc:  tvolser
+tbutc:  dvolser
      @echo ***** $@
      $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
@@ -619,7 +648,14 @@ netidmgr_plugin: xstat
        $(NTMAKE)
        $(CD) ..\..\..
 
-extra: netidmgr_plugin
+rpctestlib: fsint libafsrpc
+     @echo ***** $@
+       $(DOCD) $(TESTS)\$@
+       $(CD) $(TESTS)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+extra: netidmgr_plugin rpctestlib
 !      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      @echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -643,7 +679,9 @@ install: finale
 
 # 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
+       $(CD) $(SRC)\config
+       nmake /nologo /f ntmakefile version
+       $(CD) ..\..
        nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" media
        $(CD) $(SRC)\config
        nmake /nologo /f ntmakefile clean_version
@@ -713,10 +751,18 @@ wix: loopback man-pages documentation
    $(NTMAKE)
    $(CD) ..\..\..\..
 
+wix-lite: loopback man-pages documentation
+   @echo ***** Making Wix MSI Installer (Lite)
+   $(DOCD) $(SRC)\WINNT\install\wix
+   $(CD) $(SRC)\WINNT\install\wix
+   $(NTMAKE) LITECLIENT=1
+   $(CD) ..\..\..\..
+
 media: install NSIS wix
 
 install-nsis: install NSIS
 
 install-wix: install wix
 
+install-wix-lite: install wix-lite