winnt-more-makefile-fixes-for-cvs-head-20010906

[openafs.git] / src / config / NTMakefile

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 6068ec5..311f97a 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -23,14 +23,18 @@ INCFILES =\
        $(INCFILEDIR)\afs_args.h \
        $(INCFILEDIR)\debug.h \
        $(INCFILEDIR)\param.h \
+       $(INCFILEDIR)\afsconfig.h \
        $(INCFILEDIR)\afs_sysnames.h \
        $(INCFILEDIR)\stds.h \
        $(INCFILEDIR)\icl.h 
-\r
+
 
 $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
        $(COPY) $? $@
 
+$(INCFILEDIR)\afsconfig.h: afsconfig-windows.h
+       $(COPY) $? $@
+
 idirs: doclink
 !      IF (!EXIST($(DESTDIR)))
                $(MKDIR) $(DESTDIR)
@@ -92,31 +96,31 @@ idirs: doclink
 !      IF (!EXIST($(DESTDIR)\root.client\usr\vice\etc))
                $(MKDIR) $(DESTDIR)\root.client\usr\vice\etc
 !      ENDIF
-       $(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\.
+       $(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\afsconfig.h
+
+INCCOPY = \
+       $(DESTDIR)\bin\rmbat.bat \
+       $(DESTDIR)\bin\rmbat.rsp \
+       $(DESTDIR)\bin\NTBUILD.bat
 
-INCCOPY = \\r
-       $(DESTDIR)\bin\rmbat.bat \\r
-       $(DESTDIR)\bin\rmbat.rsp \\r
-       $(DESTDIR)\bin\NTBUILD.bat\r
-\r
-$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat\r
+$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat
        $(COPY) $? $@
        util_cr + $@
-\r
-$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp\r
+
+$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp
        $(COPY) $? $@
-\r
-$(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat\r
+
+$(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat
        $(COPY) $? $@
        util_cr + $@
-\r
+
 $(DESTDIR)\bin\NTLang.bat: NTLang.bat util_cr.exe
        $(COPY) NTLang.bat $(DESTDIR)\bin
        util_cr + $(DESTDIR)\bin\NTLang.bat
-\r
-$(DESTDIR)\NTDllmap.txt:NTDllmap.txt\r
+
+$(DESTDIR)\NTDllmap.txt:NTDllmap.txt
        $(COPY) $? $@
-\r
+
 # Create link to docs needed for media build; allow to fail in case
 # symlink not available, e.g. if using a 3.4a client, since most builds
 # aren't media builds.
@@ -137,24 +141,24 @@ NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML
                $(COPY) NTMakefile.version-NOCML NTMakefile.version
 !      ENDIF
 
-INCTOOLS = \\r
-       $(DESTDIR)\bin\mkvers.exe \\r
-       $(DESTDIR)\bin\util_cr.exe \\r
-       $(DESTDIR)\bin\touch.exe\r
-\r
+INCTOOLS = \
+       $(DESTDIR)\bin\mkvers.exe \
+       $(DESTDIR)\bin\util_cr.exe \
+       $(DESTDIR)\bin\touch.exe
+
 #mkvers.exe : mkvers.obj
 #      $(EXECONLINK)
-\r
-$(DESTDIR)\bin\mkvers.exe:mkvers.exe\r
+
+$(DESTDIR)\bin\mkvers.exe:mkvers.exe
        $(COPY) mkvers.exe $(DESTDIR)\bin\.
 
-$(DESTDIR)\bin\util_cr.exe:util_cr.exe\r
+$(DESTDIR)\bin\util_cr.exe:util_cr.exe
        $(COPY) util_cr.exe $(DESTDIR)\bin\.
-\r
+
 util_cr.exe : util_cr.obj
        $(EXECONLINK)
-\r
-$(DESTDIR)\bin\touch.exe:touch.exe\r
+
+$(DESTDIR)\bin\touch.exe:touch.exe
        $(COPY) touch.exe $(DESTDIR)\bin\.
 
 langsetup: $(DESTDIR)\bin\NTLang.bat
@@ -170,9 +174,9 @@ clean_version:
 
 clean::
        $(DEL) $(DESTDIR)\LIB\*.DLL
-       $(DEL) $(DESTDIR)\bin\mkver.exe\r
-       $(DEL) $(DESTDIR)\bin\touch.exe\r
-       $(DEL) $(DESTDIR)\bin\util_cr.exe\r
-       $(DEL) mkver.exe\r
-       $(DEL) touch.exe\r
+       $(DEL) $(DESTDIR)\bin\mkver.exe
+       $(DEL) $(DESTDIR)\bin\touch.exe
+       $(DEL) $(DESTDIR)\bin\util_cr.exe
+       $(DEL) mkver.exe
+       $(DEL) touch.exe
        $(DEL) util_cr.exe
\ No newline at end of file