pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / ccapi / test / Makefile.in

diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in
index 9edab530cde7a6aa1401d8a416c877c9e69c5ebc..bf950b6a7f490701c07b44d3ed4ee4d88d0aa49d 100644 (file)
--- a/src/ccapi/test/Makefile.in
+++ b/src/ccapi/test/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=..$(S)..
-myfulldir=ccapi$(S)test
 mydir=ccapi$(S)test
 BUILDTOP=..$(S)..
 CCAPI=$(BUILDTOP)$(S)CCAPI
@@ -8,7 +6,7 @@ CCAPI=$(BUILDTOP)$(S)CCAPI
 KFWINC= /I$(BUILDTOP)\..\..\krbcc\include
 !endif
 
-# Because all the sources are in ., 
+# Because all the sources are in .,
 #  the only includes we need are to directories outside of ccapi.
 LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)$(S)include /I$(BUILDTOP)$(S)include$(S)krb5 $(KFWINC) \
     -I$(BUILDTOP)$(S)util$(S)et /I. -I$(CCAPI)$(S)COMMON -I$(CCAPI)$(S)LIB
@@ -23,7 +21,6 @@ LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)$(S)include /I$(BUILDTOP)$(S)include$
 ##DOS##       ccs_reply.h \
 ##DOS##       ccs_request.h \
 ##DOS##       ccs_request_c.c \
-##DOS##       cci_stream.h \
 ##DOS##       cci_types.h \
 ##DOS##       win-utils.h
 
@@ -31,6 +28,7 @@ LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)$(S)include /I$(BUILDTOP)$(S)include$
 ##DOS##       ccapi_ccache_iterator.c \
 ##DOS##       ccapi_context.c \
 ##DOS##       ccapi_context_change_time.c \
+##DOS##       ccapi_err.c \
 ##DOS##       ccapi_ipc.c \
 ##DOS##       ccapi_credentials.c \
 ##DOS##       ccapi_credentials_iterator.c \
@@ -39,8 +37,7 @@ LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)$(S)include /I$(BUILDTOP)$(S)include$
 
 ##DOS##COMSRC=cci_cred_union.c \
 ##DOS##       cci_identifier.c \
-##DOS##       cci_message.c \
-##DOS##       cci_stream.c
+##DOS##       cci_message.c
 
 ##DOS##COWSRC=cci_os_identifier.c
 
@@ -67,6 +64,7 @@ PINGOBJS =  $(OUTPRE)ccapi_ccache.$(OBJEXT) \
             $(OUTPRE)ccapi_ccache_iterator.$(OBJEXT) \
             $(OUTPRE)ccapi_context.$(OBJEXT) \
             $(OUTPRE)ccapi_context_change_time.$(OBJEXT) \
+            $(OUTPRE)ccapi_err.$(OBJEXT) \
             $(OUTPRE)ccapi_ipc.$(OBJEXT) \
             $(OUTPRE)ccapi_credentials.$(OBJEXT) \
             $(OUTPRE)ccapi_credentials_iterator.$(OBJEXT) \
@@ -76,7 +74,6 @@ PINGOBJS =  $(OUTPRE)ccapi_ccache.$(OBJEXT) \
             $(OUTPRE)cci_identifier.$(OBJEXT) \
             $(OUTPRE)cci_os_identifier.$(OBJEXT) \
             $(OUTPRE)cci_message.$(OBJEXT) \
-            $(OUTPRE)cci_stream.$(OBJEXT) \
             $(OUTPRE)ccs_request_c.$(OBJEXT) \
             $(OUTPRE)pingtest.$(OBJEXT) \
             $(OBJECTS)
@@ -88,7 +85,7 @@ TEST_NAMES =    test_cc_ccache_iterator_next \
                 test_constants \
                 test_cc_initialize \
                 test_cc_credentials_iterator_next
-                
+
 MORE_TESTS =    test_cc_context_release \
                 test_cc_context_get_change_time \
                 test_cc_context_get_default_ccache_name \
@@ -138,7 +135,7 @@ MORE_TESTS =    test_cc_context_release \
 ##### Linker
 LINK   = link
 LIBS    = -lkrb5
-##DOS##LIBS = advapi32.lib rpcrt4.lib user32.lib ws2_32.lib ccapi.lib
+##DOS##LIBS = $(CLIB) $(SLIB) advapi32.lib rpcrt4.lib user32.lib ws2_32.lib ccapi.lib
 LFLAGS = /nologo $(LOPTS)
 
 all-mac::     setup-test-dir pingtest simple_lock_test build-base build-tests link-tests copy-script success-message
@@ -151,14 +148,14 @@ build-base: $(PINGOBJS)
 # compile each test
 build-tests: $(TEST_NAMES)
     @echo build-tests complete.
-    
-$(TEST_NAMES): 
-    @echo DBG: $@    
+
+$(TEST_NAMES):
+    @echo DBG: $@
     $(CC) $(ALL_CFLAGS) -Fe$(TESTDIR)$(S)$@.exe -Fd$(OBJDIR)$(S)$@.obj $@.c $(OBJECTS) $(LIBS)
 # Clean .obj from .:
     $(RM) $@.$(OBJEXT)
 ##-- These two rules build each element of the list.
-    
+
 # Make a build directory
 setup-test-dir:
        @echo "Removing old destination directory... $(DSTDIR)"
@@ -166,13 +163,13 @@ setup-test-dir:
        mkdir -p "$(TESTDIR)"
        if [ -d "$(OBJDIR)" ]; then chmod -R u+w "$(OBJDIR)" && rm -rf "$(OBJDIR)"; fi
        mkdir -p "$(OBJDIR)"
-       
+
 ## The same trick as used in TEST_NAMES to run an action on each element ofthe list WINH:
 setup-windows: $(WINH) $(LIBSRC) $(COMSRC) $(COWSRC)
        if NOT exist $(TESTDIR) mkdir $(TESTDIR)
        if NOT exist $(OBJDIR)  mkdir $(OBJDIR)
        set LINK = link
-    
+
 # This rule assumes that nmake in ..\lib\win has already run.
 #   That is how ..\Makefile.in is set up.
 $(WINH):
@@ -189,8 +186,8 @@ $(COWSRC):
 
 # This rule assumes that nmake in ..\lib\win\ has already run.
 $(OUTPRE)pingtest.exe: $(OBJECTS) $(PINGOBJS)
-# There doesn't appear to be any way to examine a variable and return a value 
-#  indicating whether a string is present in it.  We use a perl script to 
+# There doesn't appear to be any way to examine a variable and return a value
+#  indicating whether a string is present in it.  We use a perl script to
 #  check the LIB variable.  If the path to ccapi.lib isn't present, the script
 #  deletes a.tmp and the following nmake actions correct LIB.
        echo %%PATH%% > a.tmp
@@ -199,8 +196,8 @@ $(OUTPRE)pingtest.exe: $(OBJECTS) $(PINGOBJS)
         @echo Adding ..\lib\win\srctmp to LIB
         set LIB=%%LIB%%;..\lib\win\srctmp
         )
-    $(LINK) $(linkdebug) /map:$(@B)1.map -out:$(*B)1.exe $(conflags) $(PINGOBJS) $(LIBS) 
-       $(LINK) $(LFLAGS)    /map:$(@B)2.map /out:$(*B)2.exe $(conflags) $(PINGOBJS) $(LIBS) $(conlibsdll) 
+    $(LINK) $(linkdebug) /map:$(@B)1.map -out:$(*B)1.exe $(conflags) $(PINGOBJS) $(LIBS)
+       $(LINK) $(LFLAGS)    /map:$(@B)2.map /out:$(*B)2.exe $(conflags) $(PINGOBJS) $(LIBS) $(conlibsdll)
 
 link-tests: $(TEST_NAMES)
 
@@ -214,10 +211,7 @@ simple_lock_test:
        $(CC) -o $(TESTDIR)/simple_lock_test simple_lock_test.c $(LIBS)
 
 copy-script:
-    echo Copy script ...
-    cd
-    dir ccapi_test
-       cp $(SCRIPT_NAME) $(DSTDIR)$(S)$(SCRIPT_NAME)
+       $(CP) $(SCRIPT_NAME) $(DSTDIR)$(S)$(SCRIPT_NAME)
 
 success-message:
        @echo