From 00e32bec133ca18bcf83e9f4c88083812d620614 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Wed, 28 Sep 2011 20:56:09 +0000
Subject: Rename ccapi.dll to krbcc{32|64}.dll as appropriate for windows
 builds

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25267 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ccapi/common/win/OldCC/name.h |  3 ---
 src/ccapi/lib/win/Makefile.in     | 26 +++++++++++++-------------
 src/ccapi/test/Makefile.in        |  4 ++--
 3 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'src/ccapi')

diff --git a/src/ccapi/common/win/OldCC/name.h b/src/ccapi/common/win/OldCC/name.h
index 42a3fba2b4..66ca3a9f86 100644
--- a/src/ccapi/common/win/OldCC/name.h
+++ b/src/ccapi/common/win/OldCC/name.h
@@ -31,7 +31,4 @@
 #define CCAPI_MODULE "krbcc32"
 #endif
 #define CCAPI_DLL CCAPI_MODULE ".dll"
-#define CCAPI_EXE CCAPI_MODULE "s.exe"
-
-#define CCAPI_DLL   "ccapi.dll"
 #define CCAPI_EXE   "ccapiserver.exe"
\ No newline at end of file
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index f97c92b0cb..62229ba78f 100644
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -65,7 +65,7 @@ LINK	= link
 LIBS	= ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib
 LFLAGS	= /nologo $(LOPTS)
 
-all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish
+all:: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish
 
 ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf
     midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \
@@ -76,7 +76,7 @@ ccs_reply.h   ccs_reply_c.c   ccs_reply_s.c   : ccs_reply.idl   ccs_reply.acf
     ccs_reply.idl
 
 copysrc :
-    echo "Copying all sources needed to build ccapi.dll to $(SRCTMP)"
+    echo "Copying all sources needed to build $(CCLIB).dll to $(SRCTMP)"
     if NOT exist $(SRCTMP)\nul mkdir $(SRCTMP)
     xcopy /D/Y   $(CO)\*.*     $(SRCTMP)
     xcopy /D/Y   $(COWIN)\*.*  $(SRCTMP)
@@ -90,17 +90,17 @@ copysrc :
 midl : ccs_request.h ccs_reply.h
 
 # Main program:
-$(OUTPRE)ccapi.dll: $(OBJS) ccapi.def
-	$(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \
-	    /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags)
-
-ccapi.def:
-    echo ;ccapi.def is generated by a Makefile rule. > ccapi.def
-    echo HEAPSIZE	8192  >> ccapi.def
-    echo EXPORTS          >> ccapi.def
-    type ccapi.exports    >> ccapi.def
-    type ccapi_v2.exports >> ccapi.def
-    type debug.exports    >> ccapi.def
+$(OUTPRE)$(CCLIB).dll: $(OBJS) $(CCLIB).def
+	$(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -dll /map:$*.map /out:$@ /DEF:$(CCLIB).def $(OBJS) \
+	    /implib:$(CCLIB).lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags)
+
+$(CCLIB).def:
+    echo ;$(CCLIB).def is generated by a Makefile rule. > $(CCLIB).def
+    echo HEAPSIZE	8192  >> $(CCLIB).def
+    echo EXPORTS          >> $(CCLIB).def
+    type ccapi.exports    >> $(CCLIB).def
+    type ccapi_v2.exports >> $(CCLIB).def
+    type debug.exports    >> $(CCLIB).def
 
 finish:
     echo "Finished in ccapi/lib/win."
diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in
index bf950b6a7f..972e464ec0 100644
--- a/src/ccapi/test/Makefile.in
+++ b/src/ccapi/test/Makefile.in
@@ -135,7 +135,7 @@ MORE_TESTS =    test_cc_context_release \
 ##### Linker
 LINK	= link
 LIBS    = -lkrb5
-##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib ccapi.lib
+##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib $(CCLIB).lib
 LFLAGS	= /nologo $(LOPTS)
 
 all-mac::     setup-test-dir pingtest simple_lock_test build-base build-tests link-tests copy-script success-message
@@ -188,7 +188,7 @@ $(COWSRC):
 $(OUTPRE)pingtest.exe: $(OBJECTS) $(PINGOBJS)
 # There doesn't appear to be any way to examine a variable and return a value
 #  indicating whether a string is present in it.  We use a perl script to
-#  check the LIB variable.  If the path to ccapi.lib isn't present, the script
+#  check the LIB variable.  If the path to $(CCLIB).lib isn't present, the script
 #  deletes a.tmp and the following nmake actions correct LIB.
 	echo %%PATH%% > a.tmp
     perl setlib.pl
-- 
cgit