Some fixups and stubs for building ccapi on UNIX, and dependencies.

(Doesn't make a complete working implementation, but it mostly compiles.)

Does *not* include the changes to actually cause the ccapi code to get
built in normal UNIX builds.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22023 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 107 insertions, 8 deletions

diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in
index 76df8126f2..89cec5ba9f 100644
--- a/src/ccapi/lib/Makefile.in
+++ b/src/ccapi/lib/Makefile.in
@@ -3,10 +3,11 @@ myfulldir=ccapi/lib
 mydir=ccapi/lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
-LOCALINCLUDES=-I$(srcdir)/../common
+LOCALINCLUDES=-I$(srcdir)/../common -I.
 
-SHLIB_EXPDEPS= $(COM_ERR_DEPLIB)
-SHLIB_EXPLIBS=-lcom_err
+SHLIB_EXPDEPS= $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
+SHLIB_EXPLIBS=-lcom_err $(SUPPORT_LIB)
+RELDIR=../ccapi/lib
 
 LIBBASE=krb5-ccapi
 LIBMAJOR=1
@@ -14,9 +15,7 @@ LIBMINOR=0
 
 STOBJLISTS= \
 	OBJS.ST \
-	unix/OBJS.ST \
-	../common/OBJS.ST \
-	../common/unix/OBJS.ST
+	unix/OBJS.ST
 
 STLIBOBJS= \
 	ccapi_ccache.o \
@@ -62,4 +61,3 @@ clean-unix:: clean-libobjs clean-liblinks clean-libs
 @lib_frag@
 @libobj_frag@
 
-# +++ Dependency line eater +++
diff --git a/src/ccapi/lib/deps b/src/ccapi/lib/deps
new file mode 100644
index 0000000000..70c5269b59
--- /dev/null
+++ b/src/ccapi/lib/deps
@@ -0,0 +1,86 @@
+# 
+# Generated makefile dependencies follow.
+#
+ccapi_ccache.so ccapi_ccache.po $(OUTPRE)ccapi_ccache.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.c ccapi_ccache.h ccapi_credentials.h ccapi_credentials_iterator.h \
+  ccapi_ipc.h ccapi_string.h
+ccapi_ccache_iterator.so ccapi_ccache_iterator.po $(OUTPRE)ccapi_ccache_iterator.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.c ccapi_ccache_iterator.h \
+  ccapi_ipc.h
+ccapi_context.so ccapi_context.po $(OUTPRE)ccapi_context.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.h ccapi_context.c \
+  ccapi_context.h ccapi_context_change_time.h ccapi_err.h \
+  ccapi_ipc.h ccapi_string.h
+ccapi_context_change_time.so ccapi_context_change_time.po \
+  $(OUTPRE)ccapi_context_change_time.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_context_change_time.c ccapi_context_change_time.h
+ccapi_credentials.so ccapi_credentials.po $(OUTPRE)ccapi_credentials.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_credentials.c ccapi_credentials.h ccapi_string.h
+ccapi_credentials_iterator.so ccapi_credentials_iterator.po \
+  $(OUTPRE)ccapi_credentials_iterator.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_credentials.h ccapi_credentials_iterator.c ccapi_credentials_iterator.h \
+  ccapi_ipc.h
+ccapi_err.so ccapi_err.po $(OUTPRE)ccapi_err.$(OBJEXT): \
+  $(COM_ERR_DEPS) ccapi_err.c
+ccapi_ipc.so ccapi_ipc.po $(OUTPRE)ccapi_ipc.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ipc.c ccapi_ipc.h ccapi_os_ipc.h
+ccapi_string.so ccapi_string.po $(OUTPRE)ccapi_string.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_string.c ccapi_string.h
+ccapi_v2.so ccapi_v2.po $(OUTPRE)ccapi_v2.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+  $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \
+  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
+  $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \
+  $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \
+  $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \
+  ccapi_ccache.h ccapi_ccache_iterator.h ccapi_context.h \
+  ccapi_credentials.h ccapi_credentials_iterator.h ccapi_string.h \
+  ccapi_v2.c
diff --git a/src/ccapi/lib/libkrb5-ccapi.exports b/src/ccapi/lib/libkrb5-ccapi.exports
new file mode 100644
index 0000000000..1a8560f0bc
--- /dev/null
+++ b/src/ccapi/lib/libkrb5-ccapi.exports
@@ -0,0 +1 @@
+cc_close
diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in
index 2651fad39e..383159f2fb 100644
--- a/src/ccapi/lib/unix/Makefile.in
+++ b/src/ccapi/lib/unix/Makefile.in
@@ -2,10 +2,13 @@ thisconfigdir=../../..
 myfulldir=ccapi/lib/unix
 mydir=ccapi/lib/unix
 BUILDTOP=$(REL)..$(S)..$(S)..
+LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
+
+STLIBOBJS= stubs.o
+OBJS= $(OUTPRE)stubs.$(OBJEXT)
 
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
 
 @libobj_frag@
 
-# +++ Dependency line eater +++
diff --git a/src/ccapi/lib/unix/deps b/src/ccapi/lib/unix/deps
new file mode 100644
index 0000000000..2feac3c9d3
--- /dev/null
+++ b/src/ccapi/lib/unix/deps
@@ -0,0 +1 @@
+# No dependencies here.
diff --git a/src/ccapi/lib/unix/stubs.c b/src/ccapi/lib/unix/stubs.c
new file mode 100644
index 0000000000..3afd8f10ee
--- /dev/null
+++ b/src/ccapi/lib/unix/stubs.c
@@ -0,0 +1,10 @@
+#include <errno.h>
+#include "ccapi_os_ipc.h"
+
+cc_int32 cci_os_ipc_thread_init (void)
+{
+    return EINVAL;
+}
+void cci_os_ipc_thread_fini (void)
+{
+}