kill off afs/debug.h

[openafs.git] / src / config / NTMakefile

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index fb07379..e0408dc 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -10,25 +10,21 @@ RELDIR=config
 
 # Relative path to src directory depends on how we got to current directory.
 
-INCFILEDIR = $(DESTDIR)\include\afs
+INCFILEDIR    = $(DESTDIR)\include
+
+INCFILEAFSDIR = $(INCFILEDIR)\afs
 
 
 INCFILES =\
-       $(INCFILEDIR)\debug.h \
-       $(INCFILEDIR)\afsconfig.h \
-       $(INCFILEDIR)\stds.h \
-       $(INCFILEDIR)\param.h \
-       $(INCFILEDIR)\afs_sysnames.h \
-       $(INCFILEDIR)\afs_args.h \
-       $(INCFILEDIR)\debug.h \
-       $(INCFILEDIR)\param.h \
        $(INCFILEDIR)\afsconfig.h \
-       $(INCFILEDIR)\afs_sysnames.h \
-       $(INCFILEDIR)\stds.h \
-       $(INCFILEDIR)\icl.h 
+       $(INCFILEAFSDIR)\stds.h \
+       $(INCFILEAFSDIR)\param.h \
+       $(INCFILEAFSDIR)\afs_sysnames.h \
+       $(INCFILEAFSDIR)\afs_args.h \
+       $(INCFILEAFSDIR)\icl.h
 
 
-$(INCFILEDIR)\param.h: param.$(SYS_NAME).h
+$(INCFILEAFSDIR)\param.h: param.$(SYS_NAME).h
        $(COPY) $? $@
 
 $(INCFILEDIR)\afsconfig.h: afsconfig-windows.h
@@ -86,15 +82,18 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\config))
                $(MKDIR) $(OJT)\config
 !      ENDIF
+!      IF (!EXIST($(OJT)\crypto))
+               $(MKDIR) $(OJT)\crypto
+!      ENDIF
+!      IF (!EXIST($(OJT)\crypto\hcrypto))
+               $(MKDIR) $(OJT)\crypto\hcrypto
+!      ENDIF
 !      IF (!EXIST($(OJT)\des))
                $(MKDIR) $(OJT)\des
 !      ENDIF
 !      IF (!EXIST($(OJT)\des\test))
                $(MKDIR) $(OJT)\des\test
 !      ENDIF
-!      IF (!EXIST($(OJT)\des_stub))
-               $(MKDIR) $(OJT)\des_stub
-!      ENDIF
 !      IF (!EXIST($(OJT)\dir))
                $(MKDIR) $(OJT)\dir
 !      ENDIF
@@ -116,6 +115,12 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\libacl))
                $(MKDIR) $(OJT)\libacl
 !      ENDIF
+!      IF (!EXIST($(OJT)\tests))
+               $(MKDIR) $(OJT)\tests
+!      ENDIF
+!      IF (!EXIST($(OJT)\tests\rpctestlib))
+               $(MKDIR) $(OJT)\tests\rpctestlib
+!      ENDIF
 !      IF (!EXIST($(OJT)\libadmin))
                $(MKDIR) $(OJT)\libadmin
 !      ENDIF
@@ -167,12 +172,18 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\ptserver))
                $(MKDIR) $(OJT)\ptserver
 !      ENDIF
+!      IF (!EXIST($(OJT)\tptserver))
+               $(MKDIR) $(OJT)\ptserver
+!      ENDIF
 !      IF (!EXIST($(OJT)\rx))
                $(MKDIR) $(OJT)\rx
 !      ENDIF
 !      IF (!EXIST($(OJT)\rx\test))
                $(MKDIR) $(OJT)\rx\test
 !      ENDIF
+!      IF (!EXIST($(OJT)\rxdebug))
+               $(MKDIR) $(OJT)\rxdebug
+!      ENDIF
 !      IF (!EXIST($(OJT)\rxgen))
                $(MKDIR) $(OJT)\rxgen
 !      ENDIF
@@ -197,9 +208,21 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\tviced))
                $(MKDIR) $(OJT)\tviced
 !      ENDIF
+!      IF (!EXIST($(OJT)\tvolser))
+               $(MKDIR) $(OJT)\tvolser
+!      ENDIF
+!      IF (!EXIST($(OJT)\dviced))
+               $(MKDIR) $(OJT)\dviced
+!      ENDIF
+!      IF (!EXIST($(OJT)\dvolser))
+               $(MKDIR) $(OJT)\dvolser
+!      ENDIF
 !      IF (!EXIST($(OJT)\ubik))
                $(MKDIR) $(OJT)\ubik
 !      ENDIF
+!      IF (!EXIST($(OJT)\tubik))
+               $(MKDIR) $(OJT)\tubik
+!      ENDIF
 !      IF (!EXIST($(OJT)\update))
                $(MKDIR) $(OJT)\update
 !      ENDIF
@@ -230,6 +253,9 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\volser))
                $(MKDIR) $(OJT)\volser
 !      ENDIF
+!      IF (!EXIST($(OJT)\xstat))
+               $(MKDIR) $(OJT)\xstat
+!      ENDIF
 !      IF (!EXIST($(OJT)\WINNT))
                $(MKDIR) $(OJT)\WINNT
 !      ENDIF
@@ -347,9 +373,21 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\WINNT\install\InstallShield5))
                $(MKDIR) $(OJT)\WINNT\install\InstallShield5
 !      ENDIF
+!      IF (!EXIST($(OJT)\WINNT\install\loopback))
+               $(MKDIR) $(OJT)\WINNT\install\loopback
+!      ENDIF
 !      IF (!EXIST($(OJT)\WINNT\install\NSIS))
                $(MKDIR) $(OJT)\WINNT\install\NSIS
 !      ENDIF
+!      IF (!EXIST($(OJT)\WINNT\install\wix))
+               $(MKDIR) $(OJT)\WINNT\install\wix
+!      ENDIF
+!      IF (!EXIST($(OJT)\WINNT\install\wix\custom))
+               $(MKDIR) $(OJT)\WINNT\install\wix\custom
+!      ENDIF
+!      IF (!EXIST($(OJT)\WINNT\install\wix\uninstall))
+               $(MKDIR) $(OJT)\WINNT\install\wix\uninstall
+!      ENDIF
 !      IF (!EXIST($(OJT)\WINNT\install\Win9x))
                $(MKDIR) $(OJT)\WINNT\install\Win9x
 !      ENDIF
@@ -359,6 +397,9 @@ idirs: doclink
 !      IF (!EXIST($(OJT)\WINNT\license\lang))
                $(MKDIR) $(OJT)\WINNT\license\lang
 !      ENDIF
+!      IF (!EXIST($(OJT)\WINNT\netidmgr_plugin))
+               $(MKDIR) $(OJT)\WINNT\netidmgr_plugin
+!      ENDIF
 !      IF (!EXIST($(OJT)\WINNT\pthread))
                $(MKDIR) $(OJT)\WINNT\pthread
 !      ENDIF
@@ -380,6 +421,12 @@ idirs: doclink
 !      IF (!EXIST($(DESTDIR)\include\afs))
                $(MKDIR) $(DESTDIR)\include\afs
 !      ENDIF
+!      IF (!EXIST($(DESTDIR)\include\des))
+               $(MKDIR) $(DESTDIR)\include\des
+!      ENDIF
+!      IF (!EXIST($(DESTDIR)\include\hcrypto))
+               $(MKDIR) $(DESTDIR)\include\hcrypto
+!      ENDIF
 !      IF (!EXIST($(DESTDIR)\include\rx))
                $(MKDIR) $(DESTDIR)\include\rx
 !      ENDIF
@@ -463,7 +510,7 @@ doclink:
 version: $(DESTDIR)\bin\mkvers.exe NTMakefile.version 
 
 NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML
-       $(DEL) NTMakefile.version
+       -$(DEL) NTMakefile.version
 !      IF (EXIST(..\..\src\CML\state) || EXIST(..\..\..\src\CML\state))
                $(COPY) NTMakefile.version-CML NTMakefile.version
 !      ELSE
@@ -477,31 +524,45 @@ INCTOOLS = \
 
 $(INCTOOLS):$(OUT)\$$(@F)
        $(COPY) $** $(DESTDIR)\bin\.
+!IF ("$(AFSVER_CL)"=="1400")
+       $(COPY) $**.manifest $(DESTDIR)\bin\.
+!ENDIF
 
 $(OUT)\mkvers.exe : $(OUT)\mkvers.obj
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 $(OUT)\touch.exe : $(OUT)\touch.obj
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 $(OUT)\util_cr.exe : $(OUT)\util_cr.obj
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 langsetup: $(DESTDIR)\bin\NTLang.bat
 
-install: idirs $(INCTOOLS) $(INCCOPY) version $(INCFILES) $(DESTDIR)\NTDllmap.txt langsetup
+install: idirs $(INCFILES) $(INCTOOLS) $(INCCOPY) version $(DESTDIR)\NTDllmap.txt langsetup
 
 install9x: install
 
 # This clean target must be named something different than the universal
 # 'clean' so that the version file can be removed last.
 clean_version:
-       $(DEL) NTMakefile.version
+       -$(DEL) NTMakefile.version
 
 clean::
-       $(DEL) $(DESTDIR)\LIB\*.DLL
-       $(DEL) $(DESTDIR)\bin\mkver.exe
-       $(DEL) $(DESTDIR)\bin\touch.exe
-       $(DEL) $(OUT)\util_cr.exe
-       $(DEL) $(OUT)\mkver.exe
-       $(DEL) $(OUT)\touch.exe
+        -$(DEL) $(INCFILES)
+       -$(DEL) $(DESTDIR)\LIB\*.DLL
+       -$(DEL) $(DESTDIR)\bin\mkver.exe*
+       -$(DEL) $(DESTDIR)\bin\touch.exe*
+       -$(DEL) $(DESTDIR)\bin\util_cr.exe*
+       -$(DEL) $(OUT)\util_cr.exe*
+       -$(DEL) $(OUT)\mkver.exe*
+       -$(DEL) $(OUT)\touch.exe*