diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2008-01-22 20:41:48 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2008-01-22 20:41:48 +0000 |
| commit | 2c428359888d541312de82eec3b20097826c0a49 (patch) | |
| tree | 25b92c140c09593a846e6327d5f3b376fa686e85 /src/ccapi | |
| parent | 7bfff83859f4bfb254c659dc0caa529735fd2507 (diff) | |
| download | krb5-2c428359888d541312de82eec3b20097826c0a49.tar.gz krb5-2c428359888d541312de82eec3b20097826c0a49.tar.xz krb5-2c428359888d541312de82eec3b20097826c0a49.zip | |
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
Diffstat (limited to 'src/ccapi')
| -rw-r--r-- | src/ccapi/test/Makefile.w32 | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/ccapi/test/Makefile.w32 b/src/ccapi/test/Makefile.w32 index 077c20b062..c6e1c535dd 100644 --- a/src/ccapi/test/Makefile.w32 +++ b/src/ccapi/test/Makefile.w32 @@ -3,6 +3,8 @@ CO = ..\common COWIN = $(CO)\win
LIBDIR = ..\lib
LIBWIN = $(LIBDIR)\win
+SRV = ..\server
+SRVWIN = ..\server\win
!include <Win32.Mak>
@@ -24,27 +26,37 @@ OBJEXT = obj TESTDIR = $(DSTROOT)\tests
TESTEXT = exe
DSTDIR = $(DSTROOT)\ccapi_tests
-PINGOBJS = pingtest.obj ccs_request_c.obj
+
+PINGOBJS = pingtest.obj
SIMPLEOBJS = simple_lock_test.obj
-OBJS = cci_debugging.$(OBJEXT) \
- ccs_request_c.obj \
- cci_os_debugging.$(OBJEXT) \
- win-utils.obj \
- ccapi_os_ipc.obj \
- cci_stream.obj
+comobjs = cci_debugging.obj cci_stream.obj
+cowobjs = cci_os_debugging.obj
+libobjs = ccs_request_c.obj
#all: build-base simple_lock_test pingtest
all: build-base pingtest
# compile base files used by all tests
-build-base: $(OBJS)
+build-base: $(comobjs) $(libobjs) $(srvobjs)
@echo "Base objects built."
# rule to compile src files
.c.obj:
$(cc) $(cdebug) $(cflags) /Fo$(OBJDIR)\$(*B).$(OBJEXT) $(SRC)\$(*B).c
+$(comobjs) : $(CO)\$(*B).c
+ $(cc) $(cdebug) $(cflags) $(CO)\$(*B).c
+
+$(cowobjs) : $(COWIN)\$(*B).c
+ $(cc) $(cdebug) $(cflags) $(COWIN)\$(*B).c
+
+$(libobjs) : $(LIBWIN)\$(*B).c
+ $(cc) $(cdebug) $(cflags) $(LIBWIN)\$(*B).c
+
+#$(srvobjs) : $(SRVWIN)\$*.c
+# $(cc) $(cdebug) $(cflags) $(SRVWIN)\$*.c
+
simple_lock_test: simple_lock_test.obj $(OBJS)
@echo R3+ Build $(*B) in $(TESTDIR)
$(cc) $(cdebug) $(cflags) $(*B).c
@@ -55,8 +67,7 @@ simple_lock_test: simple_lock_test.obj $(OBJS) pingtest: pingtest.obj
@echo R4+ Build $(*B) in $(TESTDIR)
$(cc) $(cdebug) $(cflags) $(*B).c
-# $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(*B).obj \
- $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(PINGOBJS) \
+ $(link) $(linkdebug) $(conflags) -out:$(*B).exe $(PINGOBJS) $(libobjs) $(srvobjs) \
$(LIBS) rpcrt4.lib
@echo R4- Built $(*B) in $(TESTDIR)
|