From 69d4743dc83a2050e4e2c2fd60929abccfef498b Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Thu, 16 Aug 2012 11:10:06 -0400 Subject: Add version info for ccapi dll Without version info, this library would not get installed during an upgrade scenario, causing the MIT Kerberos application to crash on startup. Signed-off-by: Kevin Wasserman [kaduk@mit.edu: add motivation to commit message] ticket: 7336 (new) subject: Fix KfW crash on startup after upgrade queue: kfw target_version: 1.10.4 tags: pullup --- src/ccapi/lib/win/Makefile.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/ccapi') diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 695fd0e129..4a87abc3ea 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -89,10 +89,15 @@ copysrc : midl : ccs_request.h ccs_reply.h +VERSIONRC = $(BUILDTOP)\..\windows\version.rc +CCLIBRES = (OUTPRE)$(CCLIB).res # Main program: -$(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def +$(CCLIBRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DCCAPI_LIB -fo $@ -r $** + +$(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def $(CCLIBRES) $(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \ - /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags) + /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) $(CCLIBRES) rpcrt4.lib $(conlibsdll) $(conflags) $(CCLIB).def: echo ;$(CCLIB).def is generated by a Makefile rule. > $(CCLIB).def -- cgit