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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 578a78a213d73d48905985a6df26512126c0c367..273c0f6633128f4dde062efc19bd0a754072fb7f 100644 (file)
--- 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 6d1a852faccea9d4076451524be06771c96450e5..11135b6ca32a8cf6e4dfc7e6bed5a404ff367925 100644 (file)
--- 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 cc2b63fa26478c10f0eb1d8aa0b3c84db9911e0e..9c39f40f572242c3d358239989b2e4e5af87ee39 100644 (file)
--- 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 */