diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-02-09 02:55:34 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-02-09 02:55:34 +0000 |
| commit | d77868b287ffe7014d8ef3a21e809c19de88c668 (patch) | |
| tree | 80dc71db0c84e1ef33c51ebe71623252a38ab6a5 | |
| parent | 55329e7564cd0253ba77f21f0014180b5fcb0636 (diff) | |
| download | krb5-d77868b287ffe7014d8ef3a21e809c19de88c668.tar.gz krb5-d77868b287ffe7014d8ef3a21e809c19de88c668.tar.xz krb5-d77868b287ffe7014d8ef3a21e809c19de88c668.zip | |
Makefile.in: Enable the ccapi directory for windows builds
ccdefops.c: Make the ccapi the default ccache type for Windows machines.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11156 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/ccache/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/Makefile.in | 57 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccdefops.c | 2 |
3 files changed, 35 insertions, 31 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 578a78a21..273c0f663 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 8 21:53:37 1999 Theodore Y. Ts'o <tytso@mit.edu> + + * Makefile.in: Enable the ccapi directory for windows builds. + + * ccdefops.c: Make the ccapi the default ccache type for Windows + machines. + 1999-01-26 Theodore Ts'o <tytso@rsts-11.mit.edu> * Makefile.in: Add ccapi to the include path so we can find stdcc.h diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 6d1a852fa..11135b6ca 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -5,7 +5,9 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U) LOCAL_SUBDIRS = stdio file memory CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio \ - -I$(srcdir)$(S)ccapi + -I$(srcdir)$(S)ccapi $(WIN_INCLUDES) + +##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=ccache @@ -37,37 +39,32 @@ all-unix:: all-libobjs all-windows:: subdirs $(OBJFILE) -##DOSsubdirs:: file\file.lst memory\file.lst # ccapi\file.lst -##DOS -##DOSfile\file.lst:: -##DOS cd file -##DOS @echo Making in krb5\ccache\file -##DOS -$(MAKE) -$(MFLAGS) -##DOS cd .. - -##DOSmemory\file.lst:: -##DOS cd memory -##DOS @echo Making in krb5\ccache\memory -##DOS -$(MAKE) -$(MFLAGS) -##DOS cd .. - -# ##DOSccapi\file.lst:: -# ##DOS cd ccapi -# ##DOS @echo Making in krb5\ccache\ccapi -# ##DOS -$(MAKE) -$(MFLAGS) -# ##DOS cd .. - -# ##DOS$(OBJFILE): $(OBJS) file\file.lst memory\file.lst ccapi\file.lst -# ##DOS $(RM) $(OBJFILE) -# ##WIN16## $(CP) nul: $(OBJFILE) -# ##WIN32## $(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj memory\*.obj \ -# ##WIN32## ccapi\*.obj > $(OBJFILE) - -##DOS$(OBJFILE): $(OBJS) file\file.lst memory\file.lst -##DOS $(RM) $(OBJFILE) +##DOS##subdirs:: file\file.lst memory\file.lst ccapi\file.lst +##DOS## +##DOS##file\file.lst:: +##DOS## cd file +##DOS## @echo Making in krb5\ccache\file +##DOS## -$(MAKE) -$(MFLAGS) +##DOS## cd .. + +##DOS##memory\file.lst:: +##DOS## cd memory +##DOS## @echo Making in krb5\ccache\memory +##DOS## -$(MAKE) -$(MFLAGS) +##DOS## cd .. + +##DOS##ccapi\file.lst:: +##DOS## cd ccapi +##DOS## @echo Making in krb5\ccache\ccapi +##DOS## -$(MAKE) -$(MFLAGS) +##DOS## cd .. + +##DOS##$(OBJFILE): $(OBJS) file\file.lst memory\file.lst ccapi\file.lst +##DOS## $(RM) $(OBJFILE) ##WIN16## $(CP) nul: $(OBJFILE) ##WIN32## $(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj memory\*.obj \ -##WIN32## > $(OBJFILE) +##WIN32## ccapi\*.obj > $(OBJFILE) + clean-unix:: clean-libobjs diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c index cc2b63fa2..9c39f40f5 100644 --- a/src/lib/krb5/ccache/ccdefops.c +++ b/src/lib/krb5/ccache/ccdefops.c @@ -27,7 +27,7 @@ #include "k5-int.h" -#if defined(macintosh) /* || defined(_MSDOS) || defined(_WIN32) */ +#if defined(macintosh) || defined(_MSDOS) || defined(_WIN32) /* Macs and PCs use the shared, memory based credentials cache */ #include "stdcc.h" /* from ccapi subdir */ |