Windows: Cleanup build scripts; no include\afs or include\rx

As part of the build system cleanup, minimize the number of
directories in which include\afs and include\rx paths are included
by default.  To acheive this goal the windows openafs dirent.h is
moved from include\afs to include, references whenever possible to
openafs headers included in include\afs or include\rx are prefixed
with afs\ or rx\ as appropriate.

Some source files or directories have a broad range of interdependencies
that make separation quite challenging.  For those directories or files
the inclusion of the path is added at the smallest possible level.
At some point in the future the WINNT\afsd\ headers should be moved
from include\afs to include\WINNT and should be installed there first
and then referenced internally from that location instead of from the
WINNT\afsd directory.  That will permit further cleanup to be performed.

Change-Id: I5e3a9623071c71db2f4445dc43266fdb3dad2c91
Reviewed-on: http://gerrit.openafs.org/2961
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index ba429a6..6e777f4 100644 (file)
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -5,7 +5,9 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" /DSMB_UNICODE -I..\kfw\inc\loadfuncs -I..\kfw\inc\krb5 -I..\kfw\inc\leash
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" /DSMB_UNICODE -I..\kfw\inc\loadfuncs \
+        -I..\kfw\inc\krb5 -I..\kfw\inc\leash -I$(DESTDIR)\include\afs \
+        -I$(DESTDIR)\include\rx
 AFSDEV_NETGUI = 1
 RELDIR=WINNT\afsd
 !INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)

diff --git a/src/WINNT/afsd/afskfw.h b/src/WINNT/afsd/afskfw.h
index 83c66f1..fe5d87e 100644 (file)
--- a/src/WINNT/afsd/afskfw.h
+++ b/src/WINNT/afsd/afskfw.h
@@ -38,7 +38,7 @@ extern "C" {
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <cm_config.h>
-#include <rxkad.h>
+#include <rx/rxkad.h>
 
 #define CELL_MAXNAMELEN 256
 #define MAXHOSTCHARS   64

diff --git a/src/WINNT/afsd/fs_utils.c b/src/WINNT/afsd/fs_utils.c
index 9f18f78..68e45b0 100644 (file)
--- a/src/WINNT/afsd/fs_utils.c
+++ b/src/WINNT/afsd/fs_utils.c
@@ -13,17 +13,18 @@
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
-#include <malloc.h>
-#include <string.h>
 #include <winioctl.h>
 #include <winsock2.h>
 #include <nb30.h>
 
+#include <errno.h>
+#include <malloc.h>
+#include <string.h>
+
 #include <osi.h>
-#include "afsd.h"
-#include "smb.h"
-#include "cmd.h"
+#include <afsd.h>
+#include <smb.h>
+#include <afs/cmd.h>
 #include <fs_utils.h>
 #include <WINNT\afsreg.h>
 

diff --git a/src/WINNT/afssvrcfg/afscfg.cpp b/src/WINNT/afssvrcfg/afscfg.cpp
index d748100..30c62f0 100644 (file)
--- a/src/WINNT/afssvrcfg/afscfg.cpp
+++ b/src/WINNT/afssvrcfg/afscfg.cpp
@@ -30,7 +30,7 @@ extern "C" {
 #include <afs\dirpath.h>
 #include <afs\afs_clientAdmin.h>
 }
-#include <lanahelper.h>
+#include <afs\lanahelper.h>
 
 
 /*

diff --git a/src/WINNT/afssvrcfg/get_cur_config.cpp b/src/WINNT/afssvrcfg/get_cur_config.cpp
index ad6619c..99f88a6 100644 (file)
--- a/src/WINNT/afssvrcfg/get_cur_config.cpp
+++ b/src/WINNT/afssvrcfg/get_cur_config.cpp
@@ -24,8 +24,8 @@ extern "C" {
 #include "resource.h"
 
 extern "C" {
-#include "afs_vosAdmin.h"
-#include "afs\vlserver.h"
+#include <afs\afs_vosAdmin.h>
+#include <afs\vlserver.h>
 }
 
 

diff --git a/src/WINNT/afssvrcfg/salvage_dlg.cpp b/src/WINNT/afssvrcfg/salvage_dlg.cpp
index 2865d3b..147e0e6 100644 (file)
--- a/src/WINNT/afssvrcfg/salvage_dlg.cpp
+++ b/src/WINNT/afssvrcfg/salvage_dlg.cpp
@@ -22,7 +22,7 @@ extern "C" {
 #include "afscfg.h"            // Main header for this application
 #include "resource.h"
 extern "C" {
-#include "afs_bosAdmin.h"
+#include <afs/afs_bosAdmin.h>
 }
 #include "admin_info_dlg.h"
 

diff --git a/src/WINNT/afssvrcfg/salvage_results_dlg.cpp b/src/WINNT/afssvrcfg/salvage_results_dlg.cpp
index cf2ae2b..e42bdc4 100644 (file)
--- a/src/WINNT/afssvrcfg/salvage_results_dlg.cpp
+++ b/src/WINNT/afssvrcfg/salvage_results_dlg.cpp
@@ -18,7 +18,7 @@
 #include "resource.h"
 #include "salvage_results_dlg.h"
 extern "C" {
-#include "afs_bosAdmin.h"
+#include <afs\afs_bosAdmin.h>
 }
 
 

diff --git a/src/WINNT/aklog/aklog.c b/src/WINNT/aklog/aklog.c
index 63d509a..d552e0c 100644 (file)
--- a/src/WINNT/aklog/aklog.c
+++ b/src/WINNT/aklog/aklog.c
@@ -72,11 +72,11 @@
 #ifdef WIN32
 #include <windows.h>
 
-#include <cm_config.h>
-#include <auth.h>
-#include <cellconfig.h>
-#include <pioctl_nt.h>
-#include <smb_iocons.h>
+#include <afs\cm_config.h>
+#include <afs\auth.h>
+#include <afs\cellconfig.h>
+#include <afs\pioctl_nt.h>
+#include <afs\smb_iocons.h>
 
 #define stat _stat
 #define __S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask))

diff --git a/src/WINNT/bosctlsvc/bosctlsvc.c b/src/WINNT/bosctlsvc/bosctlsvc.c
index 583dd59..80abd44 100644 (file)
--- a/src/WINNT/bosctlsvc/bosctlsvc.c
+++ b/src/WINNT/bosctlsvc/bosctlsvc.c
@@ -16,7 +16,6 @@
 #include <afs/param.h>
 #include <afs/stds.h>
 
-#include <param.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index 654482d..aac7f69 100644 (file)
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -7,7 +7,7 @@
 
 # include the AFSD source tree on our inclusion path
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I..\afsd
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) /D"_AFXDLL" -I$(DESTDIR)\include\afs
 
 # include the primary makefile
 RELDIR=WINNT\client_config
@@ -39,8 +39,8 @@ EXEOBJS = \
        $(OUT)\dlg_misc.obj \
        $(OUT)\isadmin.obj \
        $(OUT)\dlg_automap.obj \
-    $(OUT)\dlg_binding.obj \
-    $(OUT)\RegistrySupport.obj
+        $(OUT)\dlg_binding.obj \
+        $(OUT)\RegistrySupport.obj
 
 EXEOBJSc = \
        $(OUT)\cellservdb.obj
@@ -57,7 +57,7 @@ VCLIBS =\
        comctl32.lib \
        shell32.lib \
        mpr.lib \
-    netapi32.lib
+        netapi32.lib
 
 EXELIBS = \
        $(DESTDIR)\lib\afs\TaAfsAppLib.lib \
@@ -91,7 +91,7 @@ COPYHEADERS = \
 AFSAPPLIB=..\afsapplib
 
 $(AFSDOBJS): $(AFSD)\$$(@B).c
-       $(C2OBJ) -I$(AFSD) $**
+       $(C2OBJ) -I$(AFSD) -I$(DESTDIR)\include\rx $**
 
 $(EXEOBJS): $$(@B).cpp
        $(C2OBJ) -I$(AFSAPPLIB) $**

diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile
index 950ce77..65de635 100644 (file)
--- a/src/WINNT/client_creds/NTMakefile
+++ b/src/WINNT/client_creds/NTMakefile
@@ -94,7 +94,7 @@ $(CLIENTOBJS): $(CLIENT)\$$(@B).cpp
        $(C2OBJ) -I$(*D) $**
 
 $(AFSDOBJS): $(AFSD)\$$(@B).c
-       $(C2OBJ) -I$(*D) $**
+       $(C2OBJ) -I$(*D) -I$(DESTDIR)\include\rx $**
 
 $(EXEOBJS): $$(@B).cpp
        $(C2OBJ) -I$(*D) -I$(AFSAPPLIB) $**

diff --git a/src/WINNT/client_creds/afscreds.h b/src/WINNT/client_creds/afscreds.h
index bd74ce8..01564d6 100644 (file)
--- a/src/WINNT/client_creds/afscreds.h
+++ b/src/WINNT/client_creds/afscreds.h
@@ -32,7 +32,7 @@ extern "C" {
 #include <osithrdnt.h>
 #include <osisleep.h>
 #include <osibasel.h>
-#include <rxkad.h>
+#include <rx/rxkad.h>
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/WINNT/client_creds/creds.cpp b/src/WINNT/client_creds/creds.cpp
index 3cec15c..4488d83 100644 (file)
--- a/src/WINNT/client_creds/creds.cpp
+++ b/src/WINNT/client_creds/creds.cpp
@@ -15,7 +15,7 @@ extern "C" {
 #include <afs\param.h>
 #include <afs\auth.h>
 #include <afs\kautils.h>
-#include <rxkad.h>
+#include <rx\rxkad.h>
 #include <afs\cm_config.h>
 #include <afs\afskfw.h>
 #include "ipaddrchg.h"

diff --git a/src/WINNT/client_creds/ipaddrchg.c b/src/WINNT/client_creds/ipaddrchg.c
index d9286c4..20e91dc 100644 (file)
--- a/src/WINNT/client_creds/ipaddrchg.c
+++ b/src/WINNT/client_creds/ipaddrchg.c
@@ -66,7 +66,7 @@
 
 #include <afs/stds.h>
 #include <krb5.h>
-#include <rxkad.h>
+#include <rx\rxkad.h>
 #include <afskfw.h>
 #include "ipaddrchg.h"
 #include "creds.h"

diff --git a/src/WINNT/client_creds/main.cpp b/src/WINNT/client_creds/main.cpp
index db8cc80..a6499eb 100644 (file)
--- a/src/WINNT/client_creds/main.cpp
+++ b/src/WINNT/client_creds/main.cpp
@@ -15,7 +15,7 @@ extern "C" {
 #include <afs/stds.h>
 #include <osilog.h>
 #include <afs/fs_utils.h>
-#include <rxkad.h>
+#include <rx\rxkad.h>
 #include <afs/afskfw.h>
 #include "ipaddrchg.h"
 }

diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile
index 934a5ef..3af3169 100644 (file)
--- a/src/WINNT/client_exp/NTMakefile
+++ b/src/WINNT/client_exp/NTMakefile
@@ -5,7 +5,8 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\afsd  /D"_WINDOWS" /D"_WINDLL" /D"_AFXDLL" /D"_USRDLL" -DUNICODE -D_UNICODE
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx \
+        /D"_WINDOWS" /D"_WINDLL" /D"_AFXDLL" /D"_USRDLL" -DUNICODE -D_UNICODE
 
 NO_CRTDBG=1                    #define this to disable any CRT_DBG flag
 RELDIR=WINNT\client_exp
@@ -50,7 +51,7 @@ DLLOBJS =\
 AFSD = ..\afsd
 
 $(OUT)\fs_utils.obj: $(AFSD)\fs_utils.c
-       $(C2OBJ) $**
+       $(C2OBJ) -I$(DESTDIR)\include\rx $**
 
 DLLSDKLIBS =\
     mpr.lib

diff --git a/src/WINNT/client_exp/gui2fs.cpp b/src/WINNT/client_exp/gui2fs.cpp
index f3f64bf..87a1ef0 100644 (file)
--- a/src/WINNT/client_exp/gui2fs.cpp
+++ b/src/WINNT/client_exp/gui2fs.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <rx/rx_globals.h>
 #include "fs.h"
 #include "fs_utils.h"
-#include <afsint.h>
+#include <afs/afsint.h>
 #include <afs/afs_consts.h>
 #include <afs/cellconfig.h>
 #include <afs/vldbint.h>

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 4862d36..0ed4243 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1401,13 +1401,14 @@
                         </Component>
                     </Directory>
                     <Directory Id="dirInclude" Name="Include">
-                        <Component Id="cmp_SDK_Include" Guid="9B12B216-B104-4E49-BE31-4042F2CBD318">
+                        <Component Id="cmp_SDK_Include" Guid="2229E5F7-1D23-4088-AF85-917CCDB2634D">
                             <File Id="filebasic_H" Name="basic.h" LongName="basic.h" DiskId="1" src="$(var.IncDir)basic.h" /> 
                             <File Id="filecrypt_H" Name="crypt.h" LongName="crypt.h" DiskId="1" src="$(var.IncDir)crypt.h" /> 
                             <File Id="filedbrpc_H" Name="dbrpc.h" LongName="dbrpc.h" DiskId="1" src="$(var.IncDir)dbrpc.h" /> 
                             <File Id="filedes_H" Name="des.h" LongName="des.h" DiskId="1" src="$(var.IncDir)des.h" /> 
                             <File Id="filedes_conf_H" Name="des_conf.h" LongName="des_conf.h" DiskId="1" src="$(var.IncDir)des_conf.h" /> 
                             <File Id="filedes_odd_H" Name="des_odd.h" LongName="des_odd.h" DiskId="1" src="$(var.IncDir)des_odd.h" /> 
+                            <File Id="filedirent_H" Name="dirent.h" LongName="dirent.h" DiskId="1" src="$(var.IncDir)dirent.h" />
                             <File Id="filelargeint_H" Name="largeint.h" LongName="largeint.h" DiskId="1" src="$(var.IncDir)largeint.h" /> 
                             <File Id="filelock_H" Name="lock.h" LongName="lock.h" DiskId="1" src="$(var.IncDir)lock.h" /> 
                             <File Id="filelwp_H" Name="lwp.h" LongName="lwp.h" DiskId="1" src="$(var.IncDir)lwp.h" /> 
@@ -1434,7 +1435,7 @@
                             <File Id="fileubik_int_H" Name="ubik_int.h" LongName="ubik_int.h" DiskId="1" src="$(var.IncDir)ubik_int.h" /> 
                         </Component>
                         <Directory Id="dirIncludeAfs" Name="afs">
-                            <Component Id="cmp_SDK_Include_afs" Guid="692D18AD-4901-4124-8B1F-5D414E65A7D0">
+                            <Component Id="cmp_SDK_Include_afs" Guid="6F1F245C-BDD9-479A-A6D8-00A8F1AE8F86">
                                 <File Id="fileacl_H" Name="acl.h" LongName="acl.h" DiskId="1" src="$(var.IncDir)afs\acl.h" /> 
                                 <File Id="fileafscbint_H" Name="afscbint.h" LongName="afscbint.h" DiskId="1" src="$(var.IncDir)afs\afscbint.h" /> 
                                 <File Id="fileafsconfig_H" Name="AFSCON~1.h" LongName="afsconfig.h" DiskId="1" src="$(var.IncDir)afs\afsconfig.h" /> 
@@ -1507,7 +1508,6 @@
                                 <File Id="filecom_err_H" Name="com_err.h" LongName="com_err.h" DiskId="1" src="$(var.IncDir)afs\com_err.h" /> 
                                 <File Id="filedebug_H" Name="debug.h" LongName="debug.h" DiskId="1" src="$(var.IncDir)afs\debug.h" /> 
                                 <File Id="filedir_H" Name="dir.h" LongName="dir.h" DiskId="1" src="$(var.IncDir)afs\dir.h" /> 
-                                <File Id="filedirent_H" Name="dirent.h" LongName="dirent.h" DiskId="1" src="$(var.IncDir)afs\dirent.h" /> 
                                 <File Id="filedirpath_H" Name="dirpath.h" LongName="dirpath.h" DiskId="1" src="$(var.IncDir)afs\dirpath.h" /> 
                                 <File Id="fileerrmap_nt_H" Name="ERRMAP~1.h" LongName="errmap_nt.h" DiskId="1" src="$(var.IncDir)afs\errmap_nt.h" /> 
                                 <File Id="fileerrors_H" Name="errors.h" LongName="errors.h" DiskId="1" src="$(var.IncDir)afs\errors.h" /> 

diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile
index c4b5fd4..a9515dc 100644 (file)
--- a/src/auth/NTMakefile
+++ b/src/auth/NTMakefile
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 
 RELDIR=auth
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I$(DESTDIR)\include\afs
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 

diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile
index 5874288..ad994bb 100644 (file)
--- a/src/budb/NTMakefile
+++ b/src/budb/NTMakefile
@@ -118,7 +118,7 @@ $(INCFILEDIR)\budb_errs.h : budb_errs.et
        $(COPY) budb_errs.h $(INCFILEDIR)\budb_errs.h
 
 budb_errs.c $(INCFILEDIR)\budb_client.h: budb_errs.et budb_client.p.h
-       $(DEL) budb_client.h budb_errs.c;
+       $(DEL) budb_client.h budb_errs.c
        $(COMPILE_ET) budb_errs -h budb_client
        $(COPY) budb_client.h $(INCFILEDIR)\budb_client.h
 
@@ -132,6 +132,7 @@ install: $(INCFILES) $(LIBFILE) $(EXEFILE)
 # Local clean target; augments predefined clean target
 
 clean::
+        $(DEL) $(INCFILES)
        $(DEL) budb_errs.c budb_errs.h budb.h budb_client.h     
        $(DEL) budb.cs.c budb.ss.c budb.xdr.c
 

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index de2bea3..55e429f 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -10,20 +10,22 @@ 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)\icl.h 
+       $(INCFILEAFSDIR)\debug.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

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 6abd176..a13f97b 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -106,18 +106,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
@@ -126,20 +135,20 @@ UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !  IF (EXIST($(AFSROOT)\$(AFS_OBJDIR)))
 #  AFS_OBJDIR is relative path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
 OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !    ELSE
 OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\free\config
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\dest\$(SYS_NAME)\free
 !    ENDIF
 !  ELSE
 !    IF (EXIST($(AFS_OBJDIR)))
 #   AFS_OBJDIR is full path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
 OJT=$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !      ELSE
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\free
 OJT=$(AFS_OBJDIR)\$(SYS_NAME)\free\config
 !      ENDIF
 !    ELSE
@@ -232,8 +241,6 @@ lang::
 afscdefs =\
        -I. \
        -I$(DESTDIR)\include \
-       -I$(DESTDIR)\include\afs \
-       -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
        -D_WIN32_IE=0x0502 \
@@ -392,6 +399,12 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -407,6 +420,12 @@ CPP2OBJ = $(C2OBJ)
 .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
 

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 151084e..42e6ecd 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -106,9 +106,18 @@ 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
@@ -238,8 +247,6 @@ lang::
 afscdefs =\
        -I. \
        -I$(DESTDIR)\include \
-       -I$(DESTDIR)\include\afs \
-       -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
        -D_WIN32_IE=0x0500 \
@@ -360,6 +367,12 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -375,6 +388,12 @@ CPP2OBJ = $(C2OBJ)
 .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
 

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index beb8ecc..b5cb903 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -110,9 +110,18 @@ 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
@@ -242,8 +251,6 @@ lang::
 afscdefs =\
        -I. \
        -I$(DESTDIR)\include \
-       -I$(DESTDIR)\include\afs \
-       -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
        -D_WIN32_IE=0x0500 \
@@ -402,6 +409,12 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -417,6 +430,12 @@ CPP2OBJ = $(C2OBJ)
 .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
 

diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h
index 23ad2af..6088655 100644 (file)
--- a/src/config/afsconfig-windows.h
+++ b/src/config/afsconfig-windows.h
@@ -64,7 +64,7 @@
 #undef HAVE_DIRECT_H
 
 /* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
+#define HAVE_DIRENT_H 1
 
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H
@@ -206,3 +206,5 @@ typedef int errno_t;
 /* Windows only supports BSD variants */
 #define S_IRUSR _S_IREAD
 #define S_IWUSR _S_IWRITE
+
+#define HAVE_CONIO_H 1

diff --git a/src/des/NTMakefile b/src/des/NTMakefile
index db073e3..93cba99 100644 (file)
--- a/src/des/NTMakefile
+++ b/src/des/NTMakefile
@@ -35,7 +35,7 @@ INCFILES =\
         $(INCFILEDIR)\des_prototypes.h \
        $(INCFILEDIR)\mit-cpyright.h \
        $(INCFILEDIR)\des_odd.h \
-       $(INCFILEDIR)\crypt.h \
+       $(INCFILEDIR)\crypt.h
 
 $(INCFILEDIR)\des_odd.h: odd.h
        $(COPY) odd.h $@

diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile
index 16e8f68..18cbbcd 100644 (file)
--- a/src/kauth/NTMakefile
+++ b/src/kauth/NTMakefile
@@ -8,6 +8,7 @@
 # Override default definitions in NTMakefile.$(SYS_NAME) before including.
 
 RELDIR=kauth
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I$(DESTDIR)\include\afs
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !include ..\config\NTMakefile.version
 

diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index 643ebba..c4f2f54 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -32,7 +32,7 @@
 #include <rx/rxstat.h>
 #ifdef AFS_NT40_ENV
 # include <winsock2.h>
-# include <krb5_nt.h>
+# include <afs/krb5_nt.h>
 #else
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/src/libadmin/cfg/cfginternal.c b/src/libadmin/cfg/cfginternal.c
index 6ea764f..a285a01 100644 (file)
--- a/src/libadmin/cfg/cfginternal.c
+++ b/src/libadmin/cfg/cfginternal.c
@@ -24,17 +24,16 @@
 #include <windows.h>
 #include <winsock2.h>
 #include <io.h>
-#include <afs/dirent.h>
 #include <WINNT/afsreg.h>
 #else
 #include <unistd.h>
-#include <dirent.h>
 #include <math.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/param.h>
 #endif /* AFS_NT40_ENV */
+#include <dirent.h>
 
 #include <pthread.h>
 

diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index 36b782b..1014550 100644 (file)
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -8,7 +8,8 @@
 # This is a pthread safe library containing ubikclient, auth, kauth.
 
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DAFS_PTHREAD_ENV -I..\WINNT\kfw\inc\loadfuncs -I..\WINNT\kfw\inc\krb5
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DAFS_PTHREAD_ENV -I..\WINNT\kfw\inc\loadfuncs \
+        -I..\WINNT\kfw\inc\krb5 -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx
 
 RELDIR=libafsauthent
 !include ..\config\NTMakefile.$(SYS_NAME)

diff --git a/src/sys/NTMakefile b/src/sys/NTMakefile
index 308a26c..54ac7f8 100644 (file)
--- a/src/sys/NTMakefile
+++ b/src/sys/NTMakefile
@@ -5,7 +5,8 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\WINNT\kfw\inc\loadfuncs -I..\WINNT\kfw\inc\krb5
+AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I..\WINNT\kfw\inc\loadfuncs -I..\WINNT\kfw\inc\krb5 \
+        -I$(DESTDIR)\include\afs -I$(DESTDIR)\include\rx
 RELDIR=sys
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version

diff --git a/src/update/client.c b/src/update/client.c
index 904f9ad..2e35d3b 100644 (file)
--- a/src/update/client.c
+++ b/src/update/client.c
@@ -22,7 +22,6 @@
 #include <winsock2.h>
 #include <WINNT/afsevent.h>
 #include <sys/utime.h>
-#include <afs/dirent.h>
 #include <direct.h>
 #include <process.h>
 #include <io.h>
@@ -32,8 +31,8 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/time.h>
-#include <dirent.h>
 #endif
+#include <dirent.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/update/server.c b/src/update/server.c
index 4e6ab76..a7fc60f 100644 (file)
--- a/src/update/server.c
+++ b/src/update/server.c
@@ -21,14 +21,13 @@
 #include <WINNT/afsevent.h>
 #include <fcntl.h>
 #include <io.h>
-#include <afs/dirent.h>
 #include <afs/procmgmt.h>
 #else
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/file.h>
-#include <dirent.h>
 #endif
+#include <dirent.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 3f463da..8c31d6f 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -14,9 +14,9 @@ RELDIR=util
 INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 
 INCFILES =\
+       $(DESTDIR)\include\dirent.h \
        $(INCFILEDIR)\afsutil.h \
        $(INCFILEDIR)\assert.h \
-       $(INCFILEDIR)\dirent.h \
        $(INCFILEDIR)\errors.h \
        $(INCFILEDIR)\itc.h \
        $(INCFILEDIR)\vice.h \
@@ -32,7 +32,7 @@ INCFILES =\
        $(INCFILEDIR)\secutil_nt.h \
         $(INCFILEDIR)\softsig.h
 
-$(DESTDIR)\include\afs\dirent.h: dirent_nt.h
+$(DESTDIR)\include\dirent.h: dirent_nt.h
        $(COPY) $** $@
 
 $(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h

diff --git a/tests/rpctestlib/rpc_test_cb_procs.c b/tests/rpctestlib/rpc_test_cb_procs.c
index e7b4943..7f679b2 100644 (file)
--- a/tests/rpctestlib/rpc_test_cb_procs.c
+++ b/tests/rpctestlib/rpc_test_cb_procs.c
@@ -59,7 +59,7 @@
 #endif
 #include <afs/errors.h>
 #include <afs/sys_prototypes.h>
-#include <rx_prototypes.h>
+#include <rx/rx_prototypes.h>
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #endif

diff --git a/tests/rpctestlib/rpc_test_main.c b/tests/rpctestlib/rpc_test_main.c
index d440530..bee11da 100644 (file)
--- a/tests/rpctestlib/rpc_test_main.c
+++ b/tests/rpctestlib/rpc_test_main.c
@@ -58,7 +58,7 @@
 #endif
 #include <afs/errors.h>
 #include <afs/sys_prototypes.h>
-#include <rx_prototypes.h>
+#include <rx/rx_prototypes.h>
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #endif

diff --git a/tests/rpctestlib/rpc_test_procs.c b/tests/rpctestlib/rpc_test_procs.c
index 9a99cd1..b47e816 100644 (file)
--- a/tests/rpctestlib/rpc_test_procs.c
+++ b/tests/rpctestlib/rpc_test_procs.c
@@ -85,7 +85,7 @@
 #endif
 #include <afs/errors.h>
 #include <afs/sys_prototypes.h>
-#include <rx_prototypes.h>
+#include <rx/rx_prototypes.h>
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 #endif