diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-02-18 18:20:41 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-02-18 18:20:41 +0000 |
| commit | a08353096de4ae17bc7a242d97f6665353b81061 (patch) | |
| tree | 767052b1b8790c0ab832e5d9027802a00b4efb9a /src/lib | |
| parent | d9f547b4670abb3aa5cba348ce44cc0c60d57071 (diff) | |
| download | krb5-a08353096de4ae17bc7a242d97f6665353b81061.tar.gz krb5-a08353096de4ae17bc7a242d97f6665353b81061.tar.xz krb5-a08353096de4ae17bc7a242d97f6665353b81061.zip | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/ccache/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccapi/Makefile.in | 9 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccapi/deps | 18 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccapi/stdcc_util.c | 2 |
4 files changed, 27 insertions, 4 deletions
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 5dcf2adf6..731505db8 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -2,7 +2,7 @@ thisconfigdir=../../.. myfulldir=lib/krb5/ccache mydir=lib/krb5/ccache BUILDTOP=$(REL)..$(S)..$(S).. -SUBDIRS = +SUBDIRS = # ccapi DEFS= RUN_SETUP = @KRB5_RUN_ENV@ diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in index 201555a55..503a2c689 100644 --- a/src/lib/krb5/ccache/ccapi/Makefile.in +++ b/src/lib/krb5/ccache/ccapi/Makefile.in @@ -1,10 +1,11 @@ -thisconfigdir=./../.. +thisconfigdir=../../../.. myfulldir=lib/krb5/ccache/ccapi -mydir=ccache/ccapi +mydir=lib/krb5/ccache/ccapi BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = $(WIN_INCLUDES) -DEFS= +DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3 +##DOS##DEFS= ##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib ##DOS##BUILDTOP = ..\..\..\.. @@ -24,3 +25,5 @@ SRCS = $(srcdir)/stdcc.c $(srcdir)/stdcc_util.c $(srcdir)/winccld.c all-unix:: all-libobjs clean-unix:: clean-libobjs + +@libobj_frag@ diff --git a/src/lib/krb5/ccache/ccapi/deps b/src/lib/krb5/ccache/ccapi/deps new file mode 100644 index 000000000..db881ca16 --- /dev/null +++ b/src/lib/krb5/ccache/ccapi/deps @@ -0,0 +1,18 @@ +# +# Generated makefile dependencies follow. +# +stdcc.so stdcc.po $(OUTPRE)stdcc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h stdcc.c stdcc.h stdcc_util.h +stdcc_util.so stdcc_util.po $(OUTPRE)stdcc_util.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ + $(SRCTOP)/include/krb5.h stdcc_util.c stdcc_util.h +winccld.so winccld.po $(OUTPRE)winccld.$(OBJEXT): winccld.c diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c index a9d1f43d0..114e79ed9 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc_util.c +++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c @@ -17,7 +17,9 @@ #include "stdcc_util.h" #include "krb5.h" +#ifdef _WIN32 /* it's part of krb5.h everywhere else */ #include "kv5m_err.h" +#endif #define fieldSize 255 |