windows-more-updates-20030315

[openafs.git] / src / config / NTMakefile

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 311f97a..886851e 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -9,17 +9,15 @@
 
 # Relative path to src directory depends on how we got to current directory.
 
-!IF (EXIST(..\..\src))
-SRCROOT = ..\..\src
-!ELSE IF (EXIST(..\..\..\src))
-SRCROOT = ..\..\..\src
-!ELSE
-!ERROR Can not find src directory from current directory.
-!ENDIF
-
 INCFILEDIR = $(DESTDIR)\include\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 \
@@ -72,6 +70,9 @@ idirs: doclink
 !      IF (!EXIST($(DESTDIR)\WinInstall\Config))
                $(MKDIR) $(DESTDIR)\WinInstall\Config
 !      ENDIF
+!      IF (!EXIST($(DESTDIR)\WinInstall\Dll))
+               $(MKDIR) $(DESTDIR)\WinInstall\Dll
+!      ENDIF
 !      IF (!EXIST($(DESTDIR)\root.server))
                $(MKDIR) $(DESTDIR)\root.server
 !      ENDIF
@@ -99,24 +100,15 @@ idirs: doclink
        $(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\afsconfig.h
 
 INCCOPY = \
-       $(DESTDIR)\bin\rmbat.bat \
-       $(DESTDIR)\bin\rmbat.rsp \
        $(DESTDIR)\bin\NTBUILD.bat
 
-$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat
-       $(COPY) $? $@
-       util_cr + $@
-
-$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp
-       $(COPY) $? $@
-
 $(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat
        $(COPY) $? $@
-       util_cr + $@
+       $(UTIL_CR) + $@
 
-$(DESTDIR)\bin\NTLang.bat: NTLang.bat util_cr.exe
+$(DESTDIR)\bin\NTLang.bat: NTLang.bat $(OJT)\util_cr.exe 
        $(COPY) NTLang.bat $(DESTDIR)\bin
-       util_cr + $(DESTDIR)\bin\NTLang.bat
+       $(UTIL_CR) + $(DESTDIR)\bin\NTLang.bat
 
 $(DESTDIR)\NTDllmap.txt:NTDllmap.txt
        $(COPY) $? $@
@@ -131,7 +123,7 @@ doclink:
        - symlink make $(DESTDIR)\doc doc-pathname
 
 
-version: $(DESTDIR)\bin\mkvers.exe NTMakefile.version
+version: $(DESTDIR)\bin\mkvers.exe NTMakefile.version 
 
 NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML
        $(DEL) NTMakefile.version
@@ -146,24 +138,21 @@ INCTOOLS = \
        $(DESTDIR)\bin\util_cr.exe \
        $(DESTDIR)\bin\touch.exe
 
-#mkvers.exe : mkvers.obj
-#      $(EXECONLINK)
+$(INCTOOLS):$(OJT)\$$(@F)
+       $(COPY) $** $(DESTDIR)\bin\.
 
-$(DESTDIR)\bin\mkvers.exe:mkvers.exe
-       $(COPY) mkvers.exe $(DESTDIR)\bin\.
-
-$(DESTDIR)\bin\util_cr.exe:util_cr.exe
-       $(COPY) util_cr.exe $(DESTDIR)\bin\.
+$(OJT)\mkvers.exe : $(OJT)\mkvers.obj
+       $(EXECONLINK)
 
-util_cr.exe : util_cr.obj
+$(OJT)\touch.exe : $(OJT)\touch.obj
        $(EXECONLINK)
 
-$(DESTDIR)\bin\touch.exe:touch.exe
-       $(COPY) touch.exe $(DESTDIR)\bin\.
+$(OJT)\util_cr.exe : $(OJT)\util_cr.obj
+       $(EXECONLINK)
 
 langsetup: $(DESTDIR)\bin\NTLang.bat
 
-install: idirs $(INCTOOLS) $(INCCOPY) version $(INCFILES) $(DESTDIR)\NTDllmap.txt langsetup 
+install: idirs $(INCTOOLS) $(INCCOPY) version $(INCFILES) $(DESTDIR)\NTDllmap.txt langsetup
 
 install9x: install
 
@@ -176,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