gtx: link against libtinfo if termlib is seperated

[openafs.git] / NTMakefile

diff --git a/NTMakefile b/NTMakefile
index 8991345..4b28fda 100644 (file)
--- a/NTMakefile
+++ b/NTMakefile
@@ -68,6 +68,13 @@ afsreg_headers:
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
+libafscp_headers:
+     @echo ***** $@
+       $(DOCD) $(SRC)\libafscp
+       $(CD) $(SRC)\libafscp
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..\..
+
 lwp_headers:
      @echo ***** $@
        $(DOCD) $(SRC)\lwp
@@ -82,13 +89,27 @@ rx_headers:
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
-util_headers:
+util_headers: opr_headers
      @echo ***** $@
        $(DOCD) $(SRC)\util
        $(CD) $(SRC)\util
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
+opr_headers: roken_headers
+     @echo ***** $@
+       $(DOCD) $(SRC)\opr
+       $(CD) $(SRC)\opr
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
+roken_headers:
+     @echo ***** $@
+       $(DOCD) $(SRC)\roken
+       $(CD) $(SRC)\roken
+       $(NTMAKE_HEADERS)
+       $(CD) ..\..
+
 hcrypto_headers: util_headers
      @echo ***** $@
        $(DOCD) $(SRC)\crypto\hcrypto
@@ -103,7 +124,7 @@ pthread: hcrypto_headers
        $(NTMAKE)
        $(CD) ..\..\..
 
-util: procmgmt_headers afsreg_headers lwp_headers rx_headers pthread
+util: procmgmt_headers afsreg_headers lwp_headers rx_headers opr
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -159,21 +180,35 @@ rxgen: lwp
        $(NTMAKE)
        $(CD) ..\..
 
-des: rxgen
+opr: rfc3961
      @echo ***** $@
-       $(DOCD) $(SRC)\des
-       $(CD) $(SRC)\des
+       $(DOCD) $(SRC)\opr
+       $(CD) $(SRC)\opr
        $(NTMAKE)
-       $(CD) ..\..
+       $(CD) ..\..\..
 
-hcrypto: des
+hcrypto: roken
      @echo ***** $@
        $(DOCD) $(SRC)\crypto\hcrypto
        $(CD) $(SRC)\crypto\hcrypto
        $(NTMAKE)
        $(CD) ..\..\..
 
-rx: hcrypto
+rfc3961: hcrypto
+     @echo ***** $@
+       $(DOCD) $(SRC)\crypto\$@
+       $(CD) $(SRC)\crypto\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+roken: pthread
+     @echo ***** $@
+        $(DOCD) $(SRC)\roken
+       $(CD) $(SRC)\roken
+       $(NTMAKE)
+       $(CD) ..\..
+
+rx: rxgen
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -283,14 +318,14 @@ auth: sys
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..     
+       $(CD) ..\..
 
 ubik: auth
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
-       $(CD) ..\..     
+       $(CD) ..\..
 
 ptserver: ubik
      @echo ***** $@
@@ -354,28 +389,35 @@ dir: butm
        $(NTMAKE)
        $(CD) ..\..
 
-vol: dir
+libafsrpc: dir
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-volser: vol
+rxtests: libafsrpc
+     @echo ***** $@
+       $(DOCD) $(SRC)\rx\test
+       $(CD) $(SRC)\rx\test
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+vol: rxtests
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-viced: volser
+volser: vol
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-update: viced
+update: volser
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -417,28 +459,21 @@ bu_utils: bosctlsvc
        $(NTMAKE)
        $(CD) ..\..
 
-libafsrpc: bu_utils
-     @echo ***** $@
-       $(DOCD) $(SRC)\$@
-       $(CD) $(SRC)\$@
-       $(NTMAKE)
-       $(CD) ..\..
-
-libafsauthent: libafsrpc
+libafsauthent: bu_utils
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tviced: libafsauthent
+viced: libafsauthent
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-tvolser: tviced
+tvolser: viced
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
@@ -473,7 +508,14 @@ talocale: tbutc
        $(NTMAKE)
        $(CD) ..\..\..
 
-license: talocale
+talocale_unicode: talocale
+     @echo ***** $@
+       $(DOCD) $(SRC)\WINNT\$@
+       $(CD) $(SRC)\WINNT\$@
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+license: talocale_unicode
      @echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -487,7 +529,7 @@ client_osi: license
        $(NTMAKE)
        $(CD) ..\..\..
 
-afsd: client_osi
+afsd: client_osi libafscp
      @echo ***** $@
        $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
@@ -648,14 +690,28 @@ netidmgr_plugin: xstat
        $(NTMAKE)
        $(CD) ..\..\..
 
-rpctestlib: fsint libafsrpc
+afsrdr: config
+        echo ***** $@
+        $(DOCD) $(SRC)\WINNT\afsrdr
+        $(CD) $(SRC)\WINNT\afsrdr
+        $(NTMAKE)
+        $(CD) ..\..\..
+
+rpctestlib: config fsint libafsrpc
      @echo ***** $@
        $(DOCD) $(TESTS)\$@
        $(CD) $(TESTS)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-extra: netidmgr_plugin rpctestlib
+libafscp: libafscp_headers util afs volser vlserver rx auth fsint afsdobjs
+     @echo ***** $@
+       $(DOCD) $(SRC)\$@
+       $(CD) $(SRC)\$@
+       $(NTMAKE)
+       $(CD) ..\..
+
+extra: config
 !      IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile)
      @echo ***** $@
     $(DOCD) $(SRC)\WINNT\$@
@@ -665,26 +721,33 @@ extra: netidmgr_plugin rpctestlib
 !      ELSE
      @echo ***** Skipping $@ ***** Not found.
 !      ENDIF
-                
-finale: extra
+
+tools: config
+     @echo ***** $@
+       $(DOCD) $(SRC)\tools\rxperf
+       $(CD) $(SRC)\tools\rxperf
+       $(NTMAKE)
+       $(CD) ..\..\..
+
+finale: netidmgr_plugin
      @echo ***** $@
        $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
-install: finale
+install: finale afsrdr tools rpctestlib extra
        @echo Build Finished Successfully
-        
+
 
 # Clean target for obj tree
 clean:
        $(CD) $(SRC)\config
-       nmake /nologo /f ntmakefile version
+       nmake /nologo /f ntmakefile version langsetup
        $(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
+       nmake /nologo /f ntmakefile clean_final
        $(CD) ..\..
 
 # Language-only build target
@@ -696,8 +759,8 @@ mkdir:
     -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\ 
+       -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\
+       -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\
     -mkdir $(DESTDIR)\checked
        -mkdir $(DESTDIR)\free
     -mkdir $(DESTDIR)\checked\bin
@@ -758,11 +821,11 @@ wix-lite: loopback man-pages documentation
    $(NTMAKE) LITECLIENT=1
    $(CD) ..\..\..\..
 
-media: install NSIS wix
-
 install-nsis: install NSIS
 
 install-wix: install wix
 
 install-wix-lite: install wix-lite
 
+media: install-wix
+