]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Windows: Cleanup of src/config/NTMakefile
authorJeffrey Altman <jaltman@your-file-system.com>
Wed, 23 Jun 2010 16:56:17 +0000 (12:56 -0400)
committerJeffrey Altman <jaltman@openafs.org>
Thu, 24 Jun 2010 02:11:10 +0000 (19:11 -0700)
src/config/NTMakefile had the following issues:

 * duplicate entries for headers in $(INCFILES)

 * no clean: rule for $(INCFILES)

 * no clean: rule for $(DESTDIR)\util_cr.exe

 * $(INCTOOLS) dependent upon $(INCFILES) but the order is reversed
   in the install: rule

Change-Id: I2707009d60b303ab897ed25d9245d893fa342a8e
Reviewed-on: http://gerrit.openafs.org/2238
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Matt Benjamin <matt@linuxbox.com>
Tested-by: Matt Benjamin <matt@linuxbox.com>
src/config/NTMakefile

index 33a093bc2ca4cee4198902eb30012f99566c27cf..a32708c35a6907d5aba9fe71fdbcced10141b7c6 100644 (file)
@@ -20,11 +20,6 @@ INCFILES =\
        $(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 
 
 
@@ -525,7 +520,7 @@ $(OUT)\util_cr.exe : $(OUT)\util_cr.obj
 
 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
 
@@ -535,9 +530,11 @@ clean_version:
        -$(DEL) NTMakefile.version
 
 clean::
+        -$(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*