opr: Add new queue implementation

[openafs.git] / src / config / NTMakefile.i386_w2k

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 8d1f725..be3b3fb 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -74,6 +74,7 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 INCLUDE = $(AFSDEV_INCLUDE)
 
+PATH = $(AFSDEV_BIN);$(PATH)
 
 !IFNDEF AFSDEV_LIB
 !ERROR Must define AFSDEV_LIB to be the default library directories.
@@ -110,18 +111,27 @@ CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
 TARGETOS = WINNT
 
 # Define defaults folder locations
-DEST=dest
-SRC=src
-OBJ=obj
+!if !defined(DEST)
+DEST=$(AFSROOT)\dest
+!endif
+!if !defined(SRC)
+SRC=$(AFSROOT)\src
+!endif
+!if !defined(OBJ)
+OBJ=$(AFSROOT)\obj
+!endif
+!if !defined(DOC)
+DOC=$(AFSROOT)\doc
+!endif
 
 !IF ("$(AFS_OBJDIR)"=="") 
 #########  AFS_OBJDIR is NOT used use default locations
 !  IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked
+DESTDIR=$(DEST)\$(SYS_NAME)\checked
+OJT=$(OBJ)\$(SYS_NAME)\checked
 !  ELSE
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free
+DESTDIR=$(DEST)\$(SYS_NAME)\free
+OJT=$(OBJ)\$(SYS_NAME)\free
 !  ENDIF
 UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !ELSE
@@ -242,8 +252,6 @@ lang::
 afscdefs =\
        -I. \
        -I$(DESTDIR)\include \
-       -I$(DESTDIR)\include\afs \
-       -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
        -D_WIN32_IE=0x0500 \
@@ -252,7 +260,6 @@ afscdefs =\
        -DWINVER=0x0500 \
        -DREGISTER_POWER_NOTIFICATIONS \
        -DAFS_FREELANCE_CLIENT \
-       -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
         $(AFSDEV_AUXCDEFINES)
 
@@ -334,17 +341,23 @@ _VC_MANIFEST_EMBED_DLL=
 SIGNTOOL=signtool.exe
 !ENDIF
 
-!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
-CODESIGN_USERLAND= $(SIGNTOOL) sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
-        /t $(CODESIGN_TIMESTAMP) /v $@
+!IF DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $(CODESIGN_OTHER) $@
 !IF "$(CODESIGN_CROSS_CERT)" != ""
-CODESIGN_KERNEL= $(SIGNTOOL) sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
-        /t $(CODESIGN_TIMESTAMP) /ac "$(CODESIGN_CROSS_CERT)" /v
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v $@
+!ENDIF
 !ENDIF
 !ELSE
-CODESIGN_USERLAND=
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" $@
+!ENDIF
+!ENDIF
 !ENDIF
 
+
 !IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
 !IF "$(SYMSTORE_COMMENT)" != ""
 SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT)
@@ -403,6 +416,15 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $< $(DESTDIR)\include\opr
+
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -415,9 +437,18 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\afs}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\afs
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\opr
+
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include\WINNT}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\WINNT