windows-dafs-20060320

[openafs.git] / src / vol / NTMakefile

diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile
index ec4f344..6396eae 100644 (file)
--- a/src/vol/NTMakefile
+++ b/src/vol/NTMakefile
@@ -5,6 +5,9 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+AFSDEV_AUXCDEFINES = -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT
+
+RELDIR=vol
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
 !INCLUDE ..\config\NTMakefile.version
 
@@ -22,7 +25,8 @@ INCFILES =\
        $(INCFILEDIR)\afs\viceinode.h \
        $(INCFILEDIR)\afs\vnode.h \
        $(INCFILEDIR)\afs\volume.h \
-       $(INCFILEDIR)\afs\voldefs.h
+       $(INCFILEDIR)\afs\voldefs.h \
+       $(INCFILEDIR)\afs\daemon_com.h
 
 
 
@@ -32,18 +36,21 @@ INCFILES =\
 LIBFILE = $(DESTDIR)\lib\afs\afsvol.lib
 
 LIBOBJS =\
-       common.obj \
-       clone.obj \
-       fssync.obj \
-       ntops.obj \
-       nuke.obj \
-       partition.obj \
-       purge.obj \
-       vnode.obj \
-       volume.obj \
-       vutil.obj \
-       ihandle.obj \
-       AFS_component_version_number.obj        
+       $(OUT)\common.obj \
+       $(OUT)\clone.obj \
+       $(OUT)\fssync-client.obj \
+       $(OUT)\fssync-server.obj \
+       $(OUT)\fssync-debug.obj \
+       $(OUT)\daemon_com.obj \
+       $(OUT)\ntops.obj \
+       $(OUT)\nuke.obj \
+       $(OUT)\partition.obj \
+       $(OUT)\purge.obj \
+       $(OUT)\vnode.obj \
+       $(OUT)\volume.obj \
+       $(OUT)\vutil.obj \
+       $(OUT)\ihandle.obj \
+       $(OUT)\AFS_component_version_number.obj 
 
 $(LIBFILE): $(LIBOBJS)
        $(LIBARCH)
@@ -63,20 +70,21 @@ EXEC_LIBS = \
        $(DESTDIR)\lib\afs\afsreg.lib \
        $(DESTDIR)\lib\afs\afsprocmgmt.lib \
        $(DESTDIR)\lib\afs\afseventlog.lib \
-       $(DESTDIR)\lib\pthread.lib
+       $(DESTDIR)\lib\afspthread.lib
 
 ############################################################################
 # build salvager
 SALVAGER = $(DESTDIR)\root.server\usr\afs\bin\salvager.exe
 
 SALVAGER_EXEOBJS =\
-       vol-salvage.obj \
-       physio.obj \
-       AFS_component_version_number.obj \
-       salvager.res
+       $(OUT)\vol-salvage.obj \
+       $(OUT)\physio.obj \
+       $(OUT)\AFS_component_version_number.obj \
+       $(OUT)\salvager.res
 
 $(SALVAGER): $(SALVAGER_EXEOBJS) $(EXEC_LIBS)
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
 
 
@@ -84,16 +92,29 @@ $(SALVAGER): $(SALVAGER_EXEOBJS) $(EXEC_LIBS)
 # build volinfo
 VOLINFO = $(DESTDIR)\root.server\usr\afs\bin\volinfo.exe
 
-$(VOLINFO): vol-info.obj physio.obj volinfo.res $(EXEC_LIBS)
+$(VOLINFO): $(OUT)\vol-info.obj $(OUT)\physio.obj $(OUT)\volinfo.res $(EXEC_LIBS)
+       $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
+       $(EXEPREP)
+
+############################################################################
+# build volinfo
+VOLBLESS = $(DESTDIR)\root.server\usr\afs\bin\vol-bless.exe
+
+$(VOLBLESS): $(OUT)\vol-bless.obj $(OUT)\physio.obj $(OUT)\vol-bless.res $(EXEC_LIBS)
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP)
 
 ############################################################################
 # generate versioninfo resources
-salvager.res: salvager.rc AFS_component_version_number.h
+$(OUT)\salvager.res: salvager.rc AFS_component_version_number.h
 
-volinfo.res: volinfo.rc AFS_component_version_number.h
+$(OUT)\volinfo.res: AFS_component_version_number.h
 
 ############################################################################
 # Install targets
 install: $(INCFILES) $(LIBFILE) $(SALVAGER) $(VOLINFO) 
+
+mkdir:
+