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 3c628133732842719a2b3e5807cf2740816fbc1b..73becede96ba1a0b9325004cbbc634a4d6041c42 100644 (file)
--- 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 3756240f70bdc12cd05dac20e641ab379c455daa..1f0524aac747ae2510ceba1171f4e709782a323e 100644 (file)
--- 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 94bd82497240be40e9ab4448f9eba11bd37d4d8d..79ca4df02da817c4e4034924d270f48b964a836c 100644 (file)
--- 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">