Windows: link to afsroken.dll
authorJeffrey Altman <jaltman@your-file-system.com>
Mon, 2 Jul 2012 05:35:43 +0000 (01:35 -0400)
committerJeffrey Altman <jaltman@your-file-system.com>
Tue, 3 Jul 2012 02:23:00 +0000 (19:23 -0700)
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>

src/WINNT/netidmgr_plugin/NTMakefile
src/procmgmt/NTMakefile
src/rxgen/NTMakefile
src/viced/NTMakefile

index 6985964..25a197b 100644 (file)
@@ -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                    \
index c35e303..610a4d7 100644 (file)
@@ -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
index 232c2dd..e2fbcfb 100644 (file)
@@ -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 \
index a5981e8..3c0b782 100644 (file)
@@ -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)