diff options
author | Kevin Koch <kpkoch@mit.edu> | 2008-03-20 15:28:11 +0000 |
---|---|---|
committer | Kevin Koch <kpkoch@mit.edu> | 2008-03-20 15:28:11 +0000 |
commit | 858c809105b5d66f1b2c8b2d3c305216a594e19c (patch) | |
tree | b873dea57e81eac459145ab8f2e2f9db6a65747f | |
parent | 5b0bc6bcaeb275fa850815b56cb81086caef0c57 (diff) | |
download | krb5-858c809105b5d66f1b2c8b2d3c305216a594e19c.zip krb5-858c809105b5d66f1b2c8b2d3c305216a594e19c.tar.gz krb5-858c809105b5d66f1b2c8b2d3c305216a594e19c.tar.bz2 |
Generate ccapi.def export list from V2, V3, debug lists. It is no longer a file in the repository
Update test Makefile.in to use file ccapi_string.c.
TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
Tags: pullup
Subj: Work on compiling the CCAPI test suite on Windows.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20284 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/ccapi/lib/win/Makefile.in | 8 | ||||
-rw-r--r-- | src/ccapi/lib/win/ccapi.def | 39 | ||||
-rw-r--r-- | src/ccapi/lib/win/debug.exports | 13 | ||||
-rw-r--r-- | src/ccapi/test/Makefile.in | 7 |
4 files changed, 27 insertions, 40 deletions
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index fa4c0ad..df4d95f 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -94,6 +94,14 @@ $(OUTPRE)ccapi.dll: $(OBJS) ccapi.def $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -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
+
finish:
echo "Finished in ccapi/lib/win."
cd ..
diff --git a/src/ccapi/lib/win/ccapi.def b/src/ccapi/lib/win/ccapi.def deleted file mode 100644 index d062e55..0000000 --- a/src/ccapi/lib/win/ccapi.def +++ /dev/null @@ -1,39 +0,0 @@ -;LIBRARY COMERR32 -HEAPSIZE 8192 - -EXPORTS - cci_debug_printf - - cc_initialize - - cci_string_new - cci_string_d_initializer - ccapi_string_release - - cci_credentials_iterator_new - cci_credentials_iterator_write - - cci_ccache_iterator_new - cci_ccache_iterator_write - - ccapi_ccache_iterator_release - ccapi_ccache_iterator_next - ccapi_ccache_iterator_clone - - ccapi_credentials_iterator_release - ccapi_credentials_iterator_next - ccapi_credentials_iterator_clone - -;debugging: - _cci_check_error - cci_os_ipc - cci_os_ipc_msg - cci_os_ipc_thread_init - cci_stream_data - cci_stream_write - cci_stream_new - - ccs_authenticate - - -
\ No newline at end of file diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports new file mode 100644 index 0000000..0c37653 --- /dev/null +++ b/src/ccapi/lib/win/debug.exports @@ -0,0 +1,13 @@ + cci_debug_printf
+ _cci_check_error
+ cci_os_ipc
+ cci_os_ipc_msg
+ cci_os_ipc_thread_init
+ cci_stream_data
+ cci_stream_write
+ cci_stream_new
+
+ ccs_authenticate
+
+
+
\ No newline at end of file diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in index a155c13..9edab53 100644 --- a/src/ccapi/test/Makefile.in +++ b/src/ccapi/test/Makefile.in @@ -34,6 +34,7 @@ LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)$(S)include /I$(BUILDTOP)$(S)include$ ##DOS## ccapi_ipc.c \ ##DOS## ccapi_credentials.c \ ##DOS## ccapi_credentials_iterator.c \ +##DOS## ccapi_string.c \ ##DOS## ccapi_v2.c ##DOS##COMSRC=cci_cred_union.c \ @@ -69,6 +70,7 @@ PINGOBJS = $(OUTPRE)ccapi_ccache.$(OBJEXT) \ $(OUTPRE)ccapi_ipc.$(OBJEXT) \ $(OUTPRE)ccapi_credentials.$(OBJEXT) \ $(OUTPRE)ccapi_credentials_iterator.$(OBJEXT) \ + $(OUTPRE)ccapi_string.$(OBJEXT) \ $(OUTPRE)ccapi_v2.$(OBJEXT) \ $(OUTPRE)cci_cred_union.$(OBJEXT) \ $(OUTPRE)cci_identifier.$(OBJEXT) \ @@ -212,7 +214,10 @@ simple_lock_test: $(CC) -o $(TESTDIR)/simple_lock_test simple_lock_test.c $(LIBS) copy-script: - cp $(SCRIPT_NAME) $(DSTDIR)/$(SCRIPT_NAME) + echo Copy script ... + cd + dir ccapi_test + cp $(SCRIPT_NAME) $(DSTDIR)$(S)$(SCRIPT_NAME) success-message: @echo |