windows-more-updates-20030315

updates for build system

diff --git a/src/DOLASTCMP.BAT b/src/DOLASTCMP.BAT
new file mode 100644 (file)
index 0000000..4546168
--- /dev/null
+++ b/src/DOLASTCMP.BAT
@@ -0,0 +1,3 @@
+ECHO @CD %1 >%AFSROOT%\golast.bat
+echo echo Directory - %1 >>%AFSROOT%\golast.bat
+

diff --git a/src/NTMakefile b/src/NTMakefile
index 87e5273..a646122 100644 (file)
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -34,91 +34,88 @@ NTMAKE_HEADERS = nmake /nologo  /f ntmakefile install_headers
 NTMAKE_OBJS = nmake /nologo /f ntmakefile install_objs
 MKDIR = mkdir
 
-SDEBUG=echo cd $(SRC)\$@ >d:\dev\bat\gc.bat
-WDEBUG=echo cd $(SRC)\WINNT\$@ >d:\dev\bat\gc.bat
-LDEBUG=echo cd $(SRC)\libadmin\$@ >d:\dev\bat\gc.bat
-TDEBUG=echo cd $(SRC)\WINNT\talocale >d:\dev\bat\gc.bat
-WADEBUG=echo cd $(SRC)\WINNT\afs_setup_utils >d:\dev\bat\gc.bat
-WIDEBUG=echo cd $(SRC)\WINNT\install\$@ >d:\dev\bat\gc.bat
-RIDEBUG=echo cd $(SRC)\WINNT\afsreg >d:\dev\bat\gc.bat
+#debug statement support jumping to last know error
+DOCD=src\DOLASTCMP.BAT
 
 config:
      echo ***** $@
+       $(DOCD) $(SRC)\config
        $(CD) $(SRC)\config
        $(NTMAKE)
        $(CD) ..\..
 
 procmgmt_headers:config
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\procmgmt
        $(CD) $(SRC)\procmgmt
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
 afsreg_headers:
      echo ***** $@
-       $(RIDEBUG)
+       $(DOCD) $(SRC)\WINNT\afsreg
        $(CD) $(SRC)\WINNT\afsreg
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
 util: procmgmt_headers afsreg_headers
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 comerr: util
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 cmd: comerr
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 afsreg: cmd
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 eventlog: afsreg
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 lwp: eventlog
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 rxgen: lwp
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 des: rxgen
      echo ***** $@
-       $(SDEBUG)
 !      IF (EXIST($(SRC)\des\NTMakefile))
+               $(DOCD) $(SRC)\des
                $(CD) $(SRC)\des
                $(NTMAKE)
                $(CD) ..\..
 !      ELSE
+               $(DOCD) $(SRC)\des_stub
                $(CD) $(SRC)\des_stub
                $(NTMAKE)
                $(CD) ..\..
@@ -126,417 +123,419 @@ des: rxgen
 
 rx: des
      echo ***** $@
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 rxstat: rx
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 rxkad: rxstat
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 pthread: rxkad
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 procmgmt: pthread
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 fsint: procmgmt
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 audit: fsint
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 osi_headers: audit
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\client_osi
        $(CD) $(SRC)\WINNT\client_osi
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
 libacl_headers: osi_headers
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\libacl
        $(CD) $(SRC)\libacl
        $(NTMAKE_HEADERS)
        $(CD) ..\..
 
 cm_headers: libacl_headers
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\afsd
        $(CD) $(SRC)\WINNT\afsd
        $(NTMAKE_HEADERS)
        $(CD) ..\..\..
 
 sys: cm_headers
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 afsdobjs: sys
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\afsd
        $(CD) $(SRC)\WINNT\afsd
        $(NTMAKE_OBJS)
        $(CD) ..\..\..
 
 auth: afsdobjs
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 ubik: auth
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..     
 
 ptserver: ubik
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..     
 
 libacl: ptserver
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 kauth: libacl
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 vlserver: kauth
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 usd: vlserver
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 bubasics: usd
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 budb:  bubasics
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 butm:  budb
      echo ***** $@
-       $(SDEBUG)
+     $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
      $(NTMAKE)
      $(CD) ..\..
 
 dir: butm
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 vol: dir
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 volser: vol
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 viced: volser
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 update: viced
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 bucoord: update
      echo ***** $@
-       $(SDEBUG)
+     $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
      $(NTMAKE)
      $(CD) ..\..
 
 butc:   bucoord
      echo ***** $@
-       $(SDEBUG)
+     $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
      $(NTMAKE)
      $(CD) ..\..
 
 bozo: butc
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 bosctlsvc: bozo
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 bu_utils: bosctlsvc
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 libafsrpc: bu_utils
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 libafsauthent: libafsrpc
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 tviced: libafsauthent
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 tbutc:  tviced
      echo ***** $@
-       $(SDEBUG)
+     $(DOCD) $(SRC)\$@
      $(CD) $(SRC)\$@
      $(NTMAKE)
      $(CD) ..\..
 
 libadmin: tbutc
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..
 
 adminutil: libadmin
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 vos: adminutil
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client: vos
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 kas: client
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 pts: kas
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 bos: pts
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 cfg: bos
      echo ***** $@
-       $(LDEBUG)
+       $(DOCD) $(SRC)\libadmin\$@
        $(CD) $(SRC)\libadmin\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 admintest: cfg
      echo ***** $@
+       $(DOCD) $(SRC)\libadmin\test
        $(CD) $(SRC)\libadmin\test
        $(NTMAKE)
        $(CD) ..\..\..
 
 talocale: admintest
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 license: talocale
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afsadmsvr: license
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afsusrmgr: afsadmsvr
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afssvrmgr: afsusrmgr
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afssvrcfg: afssvrmgr
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afssvrcpa: afssvrcfg
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_talocale: afssvrcpa
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\talocale
        $(CD) $(SRC)\WINNT\talocale
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_osi: client_talocale
      echo ***** $@
-       $(TDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 afsd: client_osi
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_cpa: afsd
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_config: client_cpa
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_exp: client_config
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 client_creds: client_exp
      echo ***** $@
-       $(WDEBUG)
+       $(DOCD) $(SRC)\WINNT\$@
        $(CD) $(SRC)\WINNT\$@
        $(NTMAKE)
        $(CD) ..\..\..
 
 finale: client_creds
      echo ***** $@
-       $(SDEBUG)
+       $(DOCD) $(SRC)\$@
        $(CD) $(SRC)\$@
        $(NTMAKE)
        $(CD) ..\..     
@@ -548,12 +547,12 @@ install: finale
 
 InstallShield5:
        echo ***** afs_setup_utils
-       $(WADEBUG)
+       $(DOCD) $(SRC)\WINNT\afs_setup_utils
        $(CD) $(SRC)\WINNT\afs_setup_utils
        $(NTMAKE)
        $(CD) ..\..\..
 
-       $(WIDEBUG)
+       $(DOCD) $(SRC)\WINNT\install\$@
        $(CD) $(SRC)\WINNT\install\$@
        $(NTMAKE)
        $(CD) ..\..\..\..

diff --git a/src/WINNT/client_osi/NTMakefile-TestOSI b/src/WINNT/client_osi/NTMakefile-TestOSI
new file mode 100644 (file)
index 0000000..00025e1
--- /dev/null
+++ b/src/WINNT/client_osi/NTMakefile-TestOSI
@@ -0,0 +1,39 @@
+# Copyright (C)  1998  Transarc Corporation.  All rights reserved.
+#
+
+!INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
+!INCLUDE ..\..\config\NTMakefile.version
+
+
+EXEFILE = $(DESTDIR)\root.client\usr\vice\etc\osidebug.exe
+
+EXEOBJS = \
+       osidebug.obj
+
+EXELIBS = \
+       $(DESTDIR)\lib\libosi.lib
+
+VCLIBS =\
+       $(DESTDIR)\lib\libosi.lib
+
+
+$(EXEFILE) : $(EXEOBJS)
+       $(EXEGUILINK) $(VCLIBS)
+
+############################################################################
+# generate versioninfo resources
+
+osidebug.res: osidebug.rc
+
+############################################################################
+# Install target; primary makefile target
+
+install: $(EXEFILE)
+
+############################################################################
+# Local clean target; augments predefined clean target
+
+clean::
+       $(DEL) osidebug.obj osidebug.exe osidebug.res
+
+

diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 018b8b0..6eb3f20 100644 (file)
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -19,13 +19,16 @@ INCFILES = bc.h
 LIBFILE = $(DESTDIR)\lib\afs\afsbxdb.lib
 
 LIBOBJS =\
-       $(OJT)\dsstub.obj \
-       $(OJT)\ubik_db_if.obj \
-       $(OJT)\status.obj \
-       $(OJT)\dlq.obj \
-       $(OJT)\bucoord_errs.obj \
-       $(OJT)\volstub.obj \
-       $(OJT)\AFS_component_version_number.obj
+       $(OJT)dsstub.obj \
+       $(OJT)ubik_db_if.obj \
+       $(OJT)status.obj \
+       $(OJT)dlq.obj \
+       $(OJT)bucoord_errs.obj \
+       $(OJT)volstub.obj \
+       $(OJT)AFS_component_version_number.obj
+
+$(LIBOBJS):$$(@B).c
+       $(C2OBJ) $**
 
 $(LIBFILE): $(LIBOBJS)
        $(LIBARCH)
@@ -37,25 +40,34 @@ $(LIBFILE): $(LIBOBJS)
 EXEFILE = $(DESTDIR)\etc\backup.exe
 
 EXEOBJS =\
-       $(OJT)\main.obj \
-       $(OJT)\config.obj \
-       $(OJT)\dsstub.obj \
-       $(OJT)\volstub.obj \
-       $(OJT)\commands.obj \
-       $(OJT)\regex.obj \
-       $(OJT)\server.obj \
-       $(OJT)\dsvs.obj \
-       $(OJT)\dump.obj \
-       $(OJT)\restore.obj \
-       $(OJT)\ubik_db_if.obj \
-       $(OJT)\dump_sched.obj \
-       $(OJT)\vol_sets.obj \
-       $(OJT)\tape_hosts.obj \
-       $(OJT)\bucoord_errs.obj \
-       $(OJT)\bc_status.obj \
-       $(OJT)\status.obj \
-       $(OJT)\dlq.obj \
-       $(OJT)\backup.res
+       $(OJT)main.obj \
+       $(OJT)config.obj \
+       $(OJT)dsstub.obj \
+       $(OJT)volstub.obj \
+       $(OJT)commands.obj \
+       $(OJT)regex.obj \
+       $(OJT)server.obj \
+       $(OJT)dsvs.obj \
+       $(OJT)dump.obj \
+       $(OJT)restore.obj \
+       $(OJT)ubik_db_if.obj \
+       $(OJT)dump_sched.obj \
+       $(OJT)vol_sets.obj \
+       $(OJT)tape_hosts.obj \
+       $(OJT)bucoord_errs.obj \
+       $(OJT)bc_status.obj \
+       $(OJT)status.obj \
+       $(OJT)dlq.obj 
+
+$(EXEOBJS):$$(@B).c
+       $(C2OBJ) $**
+
+$(OJT)backup.res:AFS_component_version_number.h
+
+       $(RC) backup.rc
+
+$(EXEOBJS):$$(@B).c
+       $(C2OBJ) $**
 
 EXELIBS =\
        $(DESTDIR)\lib\afs\afsbudb.lib \
@@ -98,7 +110,7 @@ bucoord_errs.c bc.h:    bucoord_errs.et bc.p.h
 ############################################################################
 # Definitions for generating versioninfo resources
 
-$(OJT)\backup.res: AFS_component_version_number.h
+$(OJT)backup.res: AFS_component_version_number.h
 
 ############################################################################
 # Install 
@@ -114,4 +126,4 @@ clean::
 
 
 mkdir:
-       
+

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index bbc0b61..886851e 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -165,7 +165,6 @@ clean::
        $(DEL) $(DESTDIR)\LIB\*.DLL
        $(DEL) $(DESTDIR)\bin\mkver.exe
        $(DEL) $(DESTDIR)\bin\touch.exe
-       $(DEL) $(DESTDIR)\bin\util_cr.exe
+       $(DEL) util_cr.exe
        $(DEL) mkver.exe
        $(DEL) touch.exe
-       $(DEL) util_cr.exe
\ No newline at end of file

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index e745f96..0ea4370 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -27,49 +27,43 @@ INCFILES =\
        $(INCFILEDIR)\afsutil_prototypes.h \
        $(INCFILEDIR)\secutil_nt.h
 
-$(INCFILEDIR)\dirent.h: dirent_nt.h
+$(DESTDIR)\include\afs\dirent.h: dirent_nt.h
        $(COPY) $** $@
 
-$(INCFILEDIR)\afsconfig.h: ..\libadmin\adminutil\afscoinfig.h
-       $(COPY) $** $@
-
-$(INCFILEDIR)\dirpath.h: dirpath_nt.h
+$(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h
        $(COPY) $** $@
 
 LIBFILE = $(DESTDIR)\lib\afs\afsutil.lib
 
 LIBOBJS = \
-       assert.obj \
-       base32.obj \
-       casestrcpy.obj \
-       get_krbrlm.obj \
-       hostparse.obj \
-       isathing.obj \
-       kreltime.obj \
-       ktime.obj \
-       regex.obj \
-       readdir_nt.obj \
-       serverLog.obj \
-       uuid.obj \
-       volparse.obj \
-       winsock_nt.obj \
-       errmap_nt.obj \
-       dirpath.obj \
-       fileutil.obj \
-       secutil_nt.obj
-
-$(LIBOBJS): $$(@B).c
-       $(C2OBJ) -I..\libadmin\adminutil $**
-
-$(LIBOBJS):
+       $(OJT)\assert.obj \
+       $(OJT)\base32.obj \
+       $(OJT)\casestrcpy.obj \
+       $(OJT)\get_krbrlm.obj \
+       $(OJT)\hostparse.obj \
+       $(OJT)\isathing.obj \
+       $(OJT)\kreltime.obj \
+       $(OJT)\ktime.obj \
+       $(OJT)\regex.obj \
+       $(OJT)\readdir_nt.obj \
+       $(OJT)\serverLog.obj \
+       $(OJT)\uuid.obj \
+       $(OJT)\volparse.obj \
+       $(OJT)\winsock_nt.obj \
+       $(OJT)\errmap_nt.obj \
+       $(OJT)\dirpath.obj \
+       $(OJT)\fileutil.obj \
+       $(OJT)\secutil_nt.obj
 
 $(LIBFILE): $(LIBOBJS)
        $(LIBARCH)
 
-
-install: $(INCFILES) $(LIBFILE)
+install: $(INCFILES) $(LIBOBJS) $(LIBFILE)
 
 install9x: install
 
 clean::
-       $(DEL) $(LIBFILE)
\ No newline at end of file
+       $(DEL) $(LIBFILE)
+
+mkdir:
+