state-analyzer-usage-20090326

[openafs.git] / src / tviced / NTMakefile

diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile
index 6f2d1e9..5acfd10 100644 (file)
--- a/src/tviced/NTMakefile
+++ b/src/tviced/NTMakefile
@@ -5,7 +5,7 @@
 # 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 = -DAFS_PTHREAD_ENV -DRXDEBUG
+AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG -DFSSYNC_BUILD_SERVER #-DAFS_DEMAND_ATTACH_FS
 
 RELDIR=tviced
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
@@ -19,6 +19,7 @@ SRC_DIR = ..\viced
 EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\fileserver.exe
 
 VICED = ..\viced
+TVICED = .
 VLSERVER = ..\vlserver
 LWP = ..\lwp
 LIBACL = ..\libacl
@@ -31,8 +32,10 @@ RX = ..\rx
 RXOBJS = $(OUT)\xdr_int64.obj \
          $(OUT)\xdr_int32.obj
 
-VICEDOBJS = $(OUT)\viced.obj $(OUT)\afsfileprocs.obj $(OUT)\host.obj $(OUT)\physio.obj $(OUT)\callback.obj
-VICEDRES =     $(OUT)\$(VICED)\fileserver.res
+VICEDOBJS = $(OUT)\viced.obj $(OUT)\afsfileprocs.obj $(OUT)\host.obj $(OUT)\physio.obj $(OUT)\callback.obj 
+TVICEDRES =  $(OUT)\fileserver.res
+
+TVICEDOBJS = $(OUT)\serialize_state.obj
 
 VLSERVEROBJS = $(OUT)\vldbint.cs.obj $(OUT)\vldbint.xdr.obj
 
@@ -44,15 +47,14 @@ UTILOBJS = $(OUT)\assert.obj $(OUT)\uuid.obj $(OUT)\serverLog.obj $(OUT)\fileuti
 
 DIROBJS = $(OUT)\buffer.obj $(OUT)\dir.obj $(OUT)\salvage.obj
 
-VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.obj $(OUT)\fssync.obj $(OUT)\purge.obj \
-         $(OUT)\clone.obj $(OUT)\common.obj $(OUT)\ihandle.obj $(OUT)\ntops.obj
+VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.obj \
+         $(OUT)\clone.obj $(OUT)\common.obj $(OUT)\ihandle.obj $(OUT)\ntops.obj \
+         $(OUT)\fssync-server.obj $(OUT)\fssync-client.obj $(OUT)\daemon_com.obj
 
 FSINTOBJS = $(OUT)\afsaux.obj $(OUT)\afscbint.cs.obj $(OUT)\afsint.ss.obj $(OUT)\afsint.xdr.obj
 
-EXEOBJS = $(VICEDOBJS) $(VICEDRES) $(VLSERVEROBJS) $(LWPOBJS) $(LIBACLOBJS) \
-        $(UTILOBJS) $(DIROBJS) $(VOLOBJS) $(FSINTOBJS) $(RXOBJS)
-
-
+EXEOBJS = $(VICEDOBJS) $(TVICEDRES) $(VLSERVEROBJS) $(LWPOBJS) $(LIBACLOBJS) \
+        $(UTILOBJS) $(DIROBJS) $(VOLOBJS) $(FSINTOBJS) $(RXOBJS) #$(TVICEDOBJS)
 
 noversion: install
 
@@ -64,6 +66,12 @@ $(RXOBJS): $(RX)\$$(@B).c
 $(VICEDOBJS): $(VICED)\$$(@B).c
        $(C2OBJ) -I$(VICED) -I$(UTIL) $**
 
+$(TVICEDRES): $(VICED)\fileserver.rc AFS_component_version_number.h
+       $(RC) /fo $(TVICEDRES) $(VICED)\fileserver.rc 
+
+$(TVICEDOBJS): $(TVICED)\$$(@B).c
+       $(C2OBJ) -I$(TVICED) -I$(UTIL) $**
+
 $(UTILOBJS): $(UTIL)\$$(@B).c
        $(C2OBJ) -I$(UTIL) $**
 
@@ -87,6 +95,7 @@ $(FSINTOBJS): $(FSINT)\$$(@B).C
 
 EXELIBS = \
        $(DESTDIR)\lib\afsauthent.lib \
+       $(DESTDIR)\lib\afs\afsprot.lib \
        $(DESTDIR)\lib\afsrpc.lib \
        $(DESTDIR)\lib\afs\afscmd.lib \
        $(DESTDIR)\lib\afs\afsaudit.lib \
@@ -99,9 +108,15 @@ EXELIBS = \
 
 $(EXEFILE): $(EXEOBJS) $(EXELIBS)
        $(EXECONLINK)
+        $(_VC_MANIFEST_EMBED_EXE)
        $(EXEPREP) 
+        $(CODESIGN_USERLAND)
 
 install:  $(EXEFILE)
 
 mkdir:
        
+clean::
+       $(DEL) $(TVICEDRES)
+
+       
\ No newline at end of file