Correct makefile so pingtest builds

TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594

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

diff --git a/src/ccapi/test/Makefile.w32 b/src/ccapi/test/Makefile.w32
index 077c20b062448fb8dd55e509c9ccb7a46c0e8ba5..c6e1c535dda60332d75d4962179e55516ad7dc47 100644 (file)
--- a/src/ccapi/test/Makefile.w32
+++ b/src/ccapi/test/Makefile.w32
@@ -3,6 +3,8 @@ CO      = ..\common
 COWIN   = $(CO)\win\r
 LIBDIR  = ..\lib\r
 LIBWIN  = $(LIBDIR)\win\r
+SRV     = ..\server\r
+SRVWIN  = ..\server\win\r
 \r
 !include <Win32.Mak>\r
 \r
@@ -24,27 +26,37 @@ OBJEXT = obj
 TESTDIR = $(DSTROOT)\tests\r
 TESTEXT = exe\r
 DSTDIR = $(DSTROOT)\ccapi_tests\r
-PINGOBJS = pingtest.obj ccs_request_c.obj \r
+\r
+PINGOBJS = pingtest.obj \r
 SIMPLEOBJS = simple_lock_test.obj\r
 \r
-OBJS =  cci_debugging.$(OBJEXT) \\r
-        ccs_request_c.obj \\r
-        cci_os_debugging.$(OBJEXT) \\r
-        win-utils.obj \\r
-        ccapi_os_ipc.obj \\r
-        cci_stream.obj\r
+comobjs =   cci_debugging.obj cci_stream.obj\r
+cowobjs =   cci_os_debugging.obj \r
+libobjs =   ccs_request_c.obj\r
         \r
 #all: build-base simple_lock_test pingtest \r
 all: build-base pingtest \r
 \r
 # compile base files used by all tests\r
-build-base: $(OBJS)\r
+build-base: $(comobjs) $(libobjs) $(srvobjs)\r
     @echo "Base objects built."\r
 \r
 # rule to compile src files\r
 .c.obj:\r
     $(cc) $(cdebug) $(cflags) /Fo$(OBJDIR)\$(*B).$(OBJEXT) $(SRC)\$(*B).c\r
 \r
+$(comobjs) : $(CO)\$(*B).c\r
+   $(cc) $(cdebug) $(cflags) $(CO)\$(*B).c\r
+\r
+$(cowobjs) : $(COWIN)\$(*B).c\r
+   $(cc) $(cdebug) $(cflags) $(COWIN)\$(*B).c\r
+\r
+$(libobjs) : $(LIBWIN)\$(*B).c\r
+   $(cc) $(cdebug) $(cflags) $(LIBWIN)\$(*B).c\r
+\r
+#$(srvobjs) : $(SRVWIN)\$*.c\r
+#   $(cc) $(cdebug) $(cflags) $(SRVWIN)\$*.c\r
+\r
 simple_lock_test: simple_lock_test.obj $(OBJS)\r
        @echo R3+ Build $(*B) in $(TESTDIR)\r
     $(cc) $(cdebug) $(cflags) $(*B).c\r
@@ -55,8 +67,7 @@ simple_lock_test: simple_lock_test.obj $(OBJS)
 pingtest: pingtest.obj\r
        @echo R4+ Build $(*B) in $(TESTDIR)\r
     $(cc) $(cdebug) $(cflags) $(*B).c\r
-#    $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(*B).obj \\r
-    $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(PINGOBJS) \\r
+    $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(PINGOBJS) $(libobjs) $(srvobjs) \\r
         $(LIBS) rpcrt4.lib\r
        @echo R4- Built $(*B) in $(TESTDIR)\r
 \r