From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 2 Jul 2012 05:35:43 +0000 (-0400)
Subject: Windows: link to afsroken.dll
X-Git-Tag: openafs-stable-1_8_0pre1~2302
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=754180b61ee4cb84bd21046afd813b0dc03fad54

Windows: link to afsroken.dll

All binaries must be linked against afsroken.dll.

Change-Id: I74f392a8aaadfe67f24d01a8d65df6a6228fd952
Reviewed-on: http://gerrit.openafs.org/7620
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/netidmgr_plugin/NTMakefile b/src/WINNT/netidmgr_plugin/NTMakefile
index 6985964..25a197b 100644
--- a/src/WINNT/netidmgr_plugin/NTMakefile
+++ b/src/WINNT/netidmgr_plugin/NTMakefile
@@ -92,18 +92,18 @@ OBJFILES= 				\
 	$(OUT)\dynimport.obj 		\
 	$(OUT)\krb5common.obj
 
-!if "$(CPU)" == "AMD64"
 LIBFILES= 				\
+        $(DESTDIR)\lib\afsroken.lib     \
+	$(DESTDIR)\lib\afsauthent.lib 	\
+	$(DESTDIR)\lib\libafsconf.lib 	\
+        $(DESTDIR)\lib\afs\mtafsutil.lib\
+!if "$(CPU)" == "AMD64"
 	$(AFSROOT)\src\WINNT\kfw\lib\$(CPU)\nidmgr64.lib
 !else
-LIBFILES= 				\
 	$(AFSROOT)\src\WINNT\kfw\lib\$(CPU)\nidmgr32.lib
 !endif
 
 SDKLIBFILES= 				\
-	$(DESTDIR)\lib\afsauthent.lib 	\
-	$(DESTDIR)\lib\libafsconf.lib 	\
-        $(DESTDIR)\lib\afs\mtafsutil.lib\
 	htmlhelp.lib			\
 	shell32.lib			\
 	comctl32.lib			\
diff --git a/src/procmgmt/NTMakefile b/src/procmgmt/NTMakefile
index c35e303..610a4d7 100644
--- a/src/procmgmt/NTMakefile
+++ b/src/procmgmt/NTMakefile
@@ -31,7 +31,8 @@ DLLOBJS =\
 
 DLLLIBS =\
 	$(DESTDIR)\lib\afspthread.lib \
-	$(DESTDIR)\lib\afs\afsutil.lib
+	$(DESTDIR)\lib\afs\afsutil.lib \
+        $(DESTDIR)\lib\afsroken.lib
 
 $(DLLFILE): $(DLLOBJS) $(DLLRES) $(DLLLIBS)
 	$(DLLCONLINK) /DEF:afsprocmgmt.def
diff --git a/src/rxgen/NTMakefile b/src/rxgen/NTMakefile
index 232c2dd..e2fbcfb 100644
--- a/src/rxgen/NTMakefile
+++ b/src/rxgen/NTMakefile
@@ -19,6 +19,9 @@ EXEFILE = $(DESTDIR)\bin\rxgen.exe
 
 EXERES = $(OUT)\rxgen.res
 
+EXELIBS =\
+    $(DESTDIR)\lib\afsroken.lib
+
 EXEOBJS =\
 	$(OUT)\rpc_main.obj \
 	$(OUT)\rpc_hout.obj \
diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile
index a5981e8..3c0b782 100644
--- a/src/viced/NTMakefile
+++ b/src/viced/NTMakefile
@@ -95,12 +95,15 @@ $(EXEFILE): $(EXEOBJS) $(EXELIBS)
 # Build cbd - not generally distributed debugging program
 CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe
 
+CBDLIBS =\
+	$(DESTDIR)\lib\afsroken.lib
+
 CBDRES = $(OUT)\cbd.res
 
 $(OUT)\cbd.obj: callback.c AFS_component_version_number.h
 	$(C2OBJ) callback.c -DINTERPRET_DUMP
 
-$(CBD): $(OUT)\cbd.obj $(CBDRES)
+$(CBD): $(OUT)\cbd.obj $(CBDLIBS) $(CBDRES)
 	$(EXECONLINK)
 	$(_VC_MANIFEST_EMBED_EXE)
 	$(CODESIGN_USERLAND)