[25777] in CVS-changelog-for-Kerberos-V5
svn rev #25267: trunk/src/ ccapi/common/win/OldCC/ ccapi/lib/win/
daemon@ATHENA.MIT.EDU (hartmans@mit.edu)
Wed Sep 28 16:56:11 2011
Date: Wed, 28 Sep 2011 16:56:09 -0400
From: hartmans@mit.edu
Message-Id: <201109282056.p8SKu9Kt018056@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25267
Commit By: hartmans
Log Message:
Rename ccapi.dll to krbcc{32|64}.dll as appropriate for windows builds.
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/Makefile.in
U trunk/src/ccapi/common/win/OldCC/name.h
U trunk/src/ccapi/lib/win/Makefile.in
U trunk/src/ccapi/test/Makefile.in
U trunk/src/config/win-pre.in
U trunk/src/windows/leashdll/Makefile.in
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/Makefile.in 2011-09-28 20:56:09 UTC (rev 25267)
@@ -552,7 +552,7 @@
copy appl\gss-sample\$(OUTPRE)gss-server.exe "$(KRB_INSTALL_DIR)\bin\."
copy appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\."
copy windows\ms2mit\$(OUTPRE)ms2mit.exe "$(KRB_INSTALL_DIR)\bin\."
- copy ccapi\lib\win\srctmp\$(OUTPRE)ccapi.dll "$(KRB_INSTALL_DIR)\bin\."
+ copy ccapi\lib\win\srctmp\$(OUTPRE)$(CCLIB).dll "$(KRB_INSTALL_DIR)\bin\."
copy ccapi\server\win\srctmp\$(OUTPRE)ccapiserver.exe "$(KRB_INSTALL_DIR)\bin\."
copy clients\kvno\$(OUTPRE)kvno.exe "$(KRB_INSTALL_DIR)\bin\."
copy clients\klist\$(OUTPRE)klist.exe "$(KRB_INSTALL_DIR)\bin\."
Modified: trunk/src/ccapi/common/win/OldCC/name.h
===================================================================
--- trunk/src/ccapi/common/win/OldCC/name.h 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/ccapi/common/win/OldCC/name.h 2011-09-28 20:56:09 UTC (rev 25267)
@@ -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
Modified: trunk/src/ccapi/lib/win/Makefile.in
===================================================================
--- trunk/src/ccapi/lib/win/Makefile.in 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/ccapi/lib/win/Makefile.in 2011-09-28 20:56:09 UTC (rev 25267)
@@ -65,7 +65,7 @@
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.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 @@
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)
+$(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)
-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
+$(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."
Modified: trunk/src/ccapi/test/Makefile.in
===================================================================
--- trunk/src/ccapi/test/Makefile.in 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/ccapi/test/Makefile.in 2011-09-28 20:56:09 UTC (rev 25267)
@@ -135,7 +135,7 @@
##### 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 @@
$(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
Modified: trunk/src/config/win-pre.in
===================================================================
--- trunk/src/config/win-pre.in 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/config/win-pre.in 2011-09-28 20:56:09 UTC (rev 25267)
@@ -198,7 +198,7 @@
K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib
SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib
GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib
-CCLIB=$(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib
+CCLIB=krbcc32
WLIB=
!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
@@ -208,7 +208,7 @@
K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib
SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib
GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib
-CCLIB=$(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib
+CCLIB=krbcc64
WLIB=
!endif
Modified: trunk/src/windows/leashdll/Makefile.in
===================================================================
--- trunk/src/windows/leashdll/Makefile.in 2011-09-28 20:56:02 UTC (rev 25266)
+++ trunk/src/windows/leashdll/Makefile.in 2011-09-28 20:56:09 UTC (rev 25267)
@@ -50,7 +50,7 @@
LOCALINCLUDES = -I$(BUILDTOP)\include -I.\include -I.\include\krb4 $(AFS_INCLUDES)
WINLIBS = kernel32.lib advapi32.lib user32.lib gdi32.lib Version.lib \
- ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\ccapi.lib $(AFS_LIBS)
+ ws2_32.lib dnsapi.lib $(BUILDTOP)\ccapi\lib\win\srctmp\$(CCLIB).lib $(AFS_LIBS)
WINDLLFLAGS = /nologo /dll /incremental:no /release $(LOPTS)
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
