DEVEL15-windows-viced-cbd-20060620

build the callback debug utility

(cherry picked from commit f3a7cd67c5d9d225a688892b3d5948db11e9a82e)

diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index 0ffb6b7e954f334c01990552505c37435373785d..40316610995dd32f65240a192541ac684c9f9520 100644 (file)
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -64,22 +64,22 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
         $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
 
-############################################################################
-# generate versioninfo resources
-$(OUT)\fileserver.res: AFS_component_version_number.h
-
-install:  $(INCFILES) $(OUT)\fileserver.res
-
 ############################################################################
 # Build cbd - not generally distributed debugging program
-CBD = $(OUT)\cbd.exe
+CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe
 
-$(OUT)\cbd.obj: callback.c
+$(OBJ)\cbd.obj: callback.c
        $(C2OBJ) $** -DINTERPRET_DUMP
 
 $(CBD): $(OUT)\cbd.obj 
        $(EXECONLINK)
         $(_VC_MANIFEST_EMBED_EXE)
 
+############################################################################
+# generate versioninfo resources
+$(OUT)\fileserver.res: AFS_component_version_number.h
+
+install:  $(INCFILES) $(OUT)\fileserver.res $(CBD)
+
 mkdir:
        

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 44b45235763f28efb37816c3d6631a51db622f56..a43edbd12dedcd8827e358974de002d2dcc2d097 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -2723,7 +2723,7 @@ ReadDump(char *file)
     return now;
 }
 
-#include "AFS_component_version_number.c"
+#include "AFS_component_version_number.h"
 
 int
 main(int argc, char **argv)