From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 28 Sep 2011 23:59:03 +0000 (-0400)
Subject: Windows: add resource info to afshcrypto.dll
X-Git-Tag: upstream/1.8.0_pre1^2~3212
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5ba6a6223c42abf104c02d59f8c95d1760bd9030;p=packages%2Fo%2Fopenafs.git

Windows: add resource info to afshcrypto.dll

The afshcrypto.rc file was provided but it was never compiled
nor linked to the dll.

Change-Id: I41138c53a5b53417d880ae748c7f8e8248daedce
Reviewed-on: http://gerrit.openafs.org/5517
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/crypto/hcrypto/NTMakefile b/src/crypto/hcrypto/NTMakefile
index 86525150d..1ad0955f9 100644
--- a/src/crypto/hcrypto/NTMakefile
+++ b/src/crypto/hcrypto/NTMakefile
@@ -79,6 +79,10 @@ $(HCRYPTO_INCFILES):$(HCRYPTO)\$$(@B).h
 $(INCFILES):$$(@B).h
 	$(COPY) $** $(INCFILEDIR)
 
+RESFILE = $(OUT)\afshcrypto.res
+
+$(RESFILE): afshcrypto.rc AFS_component_version_number.h
+
 !if !defined(NMAKE)
 NTMAKE = nmake /nologo /f ntmakefile
 !endif
@@ -86,7 +90,7 @@ NTMAKE = nmake /nologo /f ntmakefile
 DLLLIBS = \
 	$(DESTDIR)\lib\afsroken.lib
 
-$(LIBFILE): $(LOCAL_OBJS) $(HCRYPTO_OBJS) $(DLLLIBS)
+$(LIBFILE): $(LOCAL_OBJS) $(HCRYPTO_OBJS) $(RESFILE) $(DLLLIBS)
 	$(DLLCONLINK) /DEF:afshcrypto.def shell32.lib
         $(_VC_MANIFEST_EMBED_DLL)
 	$(DLLPREP)
diff --git a/src/crypto/hcrypto/afshcrypto.rc b/src/crypto/hcrypto/afshcrypto.rc
index 77a1b0d49..9f1c79697 100644
--- a/src/crypto/hcrypto/afshcrypto.rc
+++ b/src/crypto/hcrypto/afshcrypto.rc
@@ -15,4 +15,4 @@
 #define  AFS_VERINFO_FILENAME "afshcrypto.dll"
 
 #include "AFS_component_version_number.h"
-#include "..\config\NTVersioninfo.rc"
+#include "..\..\config\NTVersioninfo.rc"