From dc59494a80205bec93b5739a84f4a4acdc76996d Mon Sep 17 00:00:00 2001
From: Kevin Koch <kpkoch@mit.edu>
Date: Thu, 13 Mar 2008 19:30:49 +0000
Subject: Include .h files and move all declarations above all code, for
 Windows C compilation

Update makefiles to include new modules.

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@20275 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ccapi/lib/win/Makefile    | 116 ------------------------------------------
 src/ccapi/lib/win/Makefile.in |   1 +
 2 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 src/ccapi/lib/win/Makefile

(limited to 'src/ccapi/lib')

diff --git a/src/ccapi/lib/win/Makefile b/src/ccapi/lib/win/Makefile
deleted file mode 100644
index 4bdd98df7..000000000
--- a/src/ccapi/lib/win/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-!include <Win32.Mak>
-
-# . is ...\pismere\athena\auth\krb5\src\ccapi\lib\win
-CCAPI = ..\..
-CO      = $(CCAPI)\common
-COWIN   = $(CCAPI)\common\win
-CCUTIL  = $(CCAPI)\common\win\OldCC             
-LIBDIR  = $(CCAPI)\lib
-LIBWIN  = $(LIBDIR)\win
-K5SRC   = $(CCAPI)\..
-POSIX   = $(K5SRC)\lib\krb5\posix
-OLDCC   = $(LIBWIN)\OldCC
-
-INC     = -I.. -I$(CO) -I$(COWIN) -I$(K5SRC)\include -I..\..\..\util\et -I$(OLDCC) \
-    -I$(LIBWIN) -I$(CCUTIL)
-MIDLI   = /I $(K5SRC)\include /I. /I$(COWIN) /I$(CO) 
-
-!if "$(CPU)" == "i386"
-cflags = $(cflags) /EHsc /MDd -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 \
-$(INC) -D_CRT_SECURE_NO_WARNINGS
-!else
-cflags = $(cflags) /W3 -D_CRTAPI1= -D_CRTAPI2= $(INC)
-!endif
-
-!if "$(PREPROCESS)" == "P"
-cflags = $(cflags) -P
-!endif
-
-all : ccapi.dll
-
-common = cci_array_internal.obj cci_cred_union.obj cci_debugging.obj cci_identifier.obj \
-    cci_message.obj cci_stream.obj 
-    
-commonwin = cci_os_debugging.obj \
-            cci_os_identifier.obj \
-            tls.obj \
-            win-utils.obj
-
-dll =   ccapi_ccache.obj \
-        ccapi_ccache_iterator.obj \
-        ccapi_context.obj \
-        ccapi_context_change_time.obj \
-        ccapi_credentials.obj \
-        ccapi_credentials_iterator.obj \
-        ccapi_ipc.obj \
-        ccapi_string.obj 
-
-dllwin =    ccs_reply_s.obj \
-            ccs_reply_proc.obj \
-            ccs_request_c.obj            
-            
-dllwincxx = ccapi_os_ipc.obj \
-            dllmain.obj
-            
-oldcc   =   client.obj \
-            rpc.obj 
-            
-utils   =   ccutils.obj
-
-utilscxx =  init.obj \
-            secure.obj \
-            util.obj
-
-
-linkobjs = $(common) $(commonwin) $(dll) $(dllwin) $(dllwincxx) $(oldcc) $(utils) $(utilscxx)
-
-#includes = 
-
-# Main program:
-ccapi.dll : $(linkobjs) ccapi.def
-    $(link) $(linkdebug) $(conflags) -out:ccapi.dll /DEF:ccapi.def /implib:ccapi.lib $(dlllflags) \
-        $(linkobjs) rpcrt4.lib kernel32.lib user32.lib $(conlibsdll) 
-
-
-ccs_request.h ccs_request_c.c ccs_request_s.c : $(COWIN)\ccs_request.idl $(COWIN)\ccs_request.acf
-    midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(cc) -cpp_opt "-E" \
-    $(COWIN)\ccs_request.idl
-
-ccs_reply.h   ccs_reply_c.c   ccs_reply_s.c   : $(COWIN)\ccs_reply.idl   $(COWIN)\ccs_reply.acf
-    midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(cc) -cpp_opt "-E" -I. -I$(COWIN) \
-    $(COWIN)\ccs_reply.idl
-
-$(common) : $(CO)\$*.c
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(CO)\$*.c
-
-$(commonwin) : $(COWIN)\$*.c
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(COWIN)\$*.c
-
-$(dll) : $(LIBDIR)\$*.c
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(LIBDIR)\$*.c
-
-$(dllwin) : $*.c ccs_reply.h ccs_request.h
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(LIBWIN)\$*.c
-
-$(dllwincxx) : $*.cxx ccs_reply.h ccs_request.h
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(LIBWIN)\$*.cxx
-
-$(oldcc) : $(OLDCC)\$*.cxx
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(OLDCC)\$*.cxx
-
-$(utils) : $(CCUTIL)\$*.c
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(CCUTIL)\$*.c
-
-$(utilscxx) : $(CCUTIL)\$*.cxx
-   $(cc) $(cdebug) $(cflags) $(cvarsdll) $(CCUTIL)\$*.cxx
-
-
-
-# Clean up everything
-cleanall : clean
-    -del *.dll
-
-# Clean up everything but the .EXEs
-clean :
-    -del *.obj
-    -del *.map
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in
index ab958d7d6..fa4c0adef 100644
--- a/src/ccapi/lib/win/Makefile.in
+++ b/src/ccapi/lib/win/Makefile.in
@@ -9,6 +9,7 @@ OBJS	= $(OUTPRE)ccapi_ccache.obj \
           $(OUTPRE)ccapi_ipc.obj \
           $(OUTPRE)ccapi_os_ipc.obj \
           $(OUTPRE)ccapi_string.obj \
+          $(OUTPRE)ccapi_v2.obj \
           $(OUTPRE)cci_array_internal.obj \
           $(OUTPRE)cci_cred_union.obj \
           $(OUTPRE)cci_debugging.obj \
-- 
cgit