From 11bec8254cbdfac4b19f8252a129582a59ecad28 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 3 Oct 2007 16:19:06 +0000 Subject: [PATCH] DEVEL15-windows-tviced-resfile-20071003 Add explicit build rules for TVICEDRES since we do not build the non-threaded file server on Windows (cherry picked from commit a4b995b61811ccfbe0586ad8ab3c096cf817d9b7) --- src/tviced/NTMakefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile index be778d509..67420a9ff 100644 --- a/src/tviced/NTMakefile +++ b/src/tviced/NTMakefile @@ -33,7 +33,7 @@ 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 +TVICEDRES = $(OUT)\fileserver.res TVICEDOBJS = $(OUT)\serialize_state.obj @@ -53,8 +53,8 @@ VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.o 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) #$(TVICEDOBJS) +EXEOBJS = $(VICEDOBJS) $(TVICEDRES) $(VLSERVEROBJS) $(LWPOBJS) $(LIBACLOBJS) \ + $(UTILOBJS) $(DIROBJS) $(VOLOBJS) $(FSINTOBJS) $(RXOBJS) #$(TVICEDOBJS) noversion: install @@ -66,6 +66,9 @@ $(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) $** @@ -112,3 +115,7 @@ install: $(EXEFILE) mkdir: +clean:: + $(DEL) $(TVICEDRES) + + \ No newline at end of file -- 2.39.5