From: Asanka Herath <asanka@secure-endpoints.com>
Date: Thu, 21 May 2009 04:26:12 +0000 (+0000)
Subject: DEVEL15-windows-make-cygwin-libs-20090520
X-Git-Tag: openafs-devel-1_5_60~32
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4d88040478b247d5f070ad27bf7032803f4bda15;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-make-cygwin-libs-20090520

LICENSE MIT

added libosi.a and libafsconf.a


(cherry picked from commit 716c81782eae719b43b3b90464b821b398a0f9a6)
---

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 3c6281337..73becede9 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -193,6 +193,7 @@ $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
 	$(DLLPREP)
         $(CODESIGN_USERLAND)
+	$(MAKECYGLIB) --input-def libafsconf.def
 	$(COPY) $*.lib $(ILIBDIR)
 	$(DEL) $*.lib $*.exp
 
diff --git a/src/WINNT/client_osi/NTMakefile b/src/WINNT/client_osi/NTMakefile
index 3756240f7..1f0524aac 100644
--- a/src/WINNT/client_osi/NTMakefile
+++ b/src/WINNT/client_osi/NTMakefile
@@ -79,6 +79,7 @@ $(DLLFILE): $(DLLOBJS)
         $(_VC_MANIFEST_EMBED_DLL)
 	$(DLLPREP)
         $(CODESIGN_USERLAND)
+	$(MAKECYGLIB) --input-def libosi.def
 	$(COPY) $*.lib $(ILIBDIR)
 	$(DEL) $*.lib $*.exp
 
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 94bd82497..79ca4df02 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1709,6 +1709,8 @@
                           <File Id="fileafsauthent_A" Name="afsauth.a" LongName="afsauthent.a" DiskId="1" src="$(var.LibDir)afsauthent.a" />
                           <File Id="fileafspthread_A" Name="afspthrd.a" LongName="afspthread.a" DiskId="1" src="$(var.LibDir)afspthread.a" />
                           <File Id="fileafsrpc_A" Name="afsrpc.a" LongName="afsrpc.a" DiskId="1" src="$(var.LibDir)afsrpc.a" />
+                          <File Id="filelibafsconf_A" Name="libafscf.a" LongName="libafsconf.a" DiskId="1" src="$(var.ClientDir)libafsconf.a" />
+                          <File Id="filelibosi_A" Name="libosi.a" LongName="libosi.a" DiskId="1" src="$(var.ClientDir)libosi.a" /> 
                         </Component>
                         <?endif?>
                         <Directory Id="dirLibAfs" Name="afs">