X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=NTMakefile;h=8991345abb41e86bae27e4b1df1b00b67cbb6713;hp=1bc22fc10be8622ee15979dc4eaf9a91143af066;hb=8652f146abc5406195b5170402fe4dfd939da9f0;hpb=ed74213df6449aba8ec58250f912fbc526a3cb56

diff --git a/NTMakefile b/NTMakefile
index 1bc22fc..8991345 100644
--- 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\$@
@@ -153,19 +161,19 @@ rxgen: lwp
 
 des: rxgen
      @echo ***** $@
-!	IF (EXIST($(SRC)\des\NTMakefile))
-		$(DOCD) $(SRC)\des
-		$(CD) $(SRC)\des
-		$(NTMAKE)
-		$(CD) ..\..
-!	ELSE
-		$(DOCD) $(SRC)\des_stub
-		$(CD) $(SRC)\des_stub
-		$(NTMAKE)
-		$(CD) ..\..
-!	ENDIF
+	$(DOCD) $(SRC)\des
+	$(CD) $(SRC)\des
+	$(NTMAKE)
+	$(CD) ..\..
 
-rx: des
+hcrypto: des
+     @echo ***** $@
+	$(DOCD) $(SRC)\crypto\hcrypto
+	$(CD) $(SRC)\crypto\hcrypto
+	$(NTMAKE)
+	$(CD) ..\..\..
+
+rx: hcrypto
      @echo ***** $@
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
@@ -289,7 +297,7 @@ ptserver: ubik
 	$(DOCD) $(SRC)\$@
 	$(CD) $(SRC)\$@
 	$(NTMAKE)
-	$(CD) ..\..	
+	$(CD) ..\..
 
 libacl: ptserver
      @echo ***** $@
@@ -437,7 +445,21 @@ tvolser: tviced
 	$(NTMAKE)
 	$(CD) ..\..
 
-tbutc:  tvolser
+dviced: tvolser
+     @echo ***** $@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+dvolser: dviced
+     @echo ***** $@
+	$(DOCD) $(SRC)\$@
+	$(CD) $(SRC)\$@
+	$(NTMAKE)
+	$(CD) ..\..
+
+tbutc:  dvolser
      @echo ***** $@
      $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
@@ -626,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\$@
@@ -650,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
@@ -680,14 +711,14 @@ loopback:
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-man-pages: 
+man-pages: config
    @echo ***** $@
    $(DOCD) $(DOC)\man-pages
    $(CD) $(DOC)\man-pages
    $(NTMAKE)
    $(CD) ..\..
 
-documentation:
+documentation: config
    @echo ***** $@
    $(DOCD) $(DOC)\xml\ReleaseNotesWindows
    $(CD) $(DOC)\xml\ReleaseNotesWindows
@@ -720,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