Add tests for trace.c formatting

[krb5.git] / src / lib / krb5 / os / Makefile.in

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 903d86af1f200437f502756cc08b25897d869816..9faab25ee7f971af9a790982f1499ae81fdb54eb 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -18,6 +18,7 @@ STLIBOBJS= \
        def_realm.o     \
        ccdefname.o     \
        changepw.o      \
+       cm.o            \
        dnsglue.o       \
        dnssrv.o        \
        free_krbhs.o    \
@@ -44,7 +45,6 @@ STLIBOBJS= \
        read_msg.o      \
        read_pwd.o      \
        realm_dom.o     \
-       realm_iter.o    \
        sendto_kdc.o    \
        sn2princ.o      \
         thread_safe.o   \
@@ -62,6 +62,7 @@ OBJS= \
        $(OUTPRE)def_realm.$(OBJEXT)    \
        $(OUTPRE)ccdefname.$(OBJEXT)    \
        $(OUTPRE)changepw.$(OBJEXT)     \
+       $(OUTPRE)cm.$(OBJEXT)           \
        $(OUTPRE)dnsglue.$(OBJEXT)      \
        $(OUTPRE)dnssrv.$(OBJEXT)       \
        $(OUTPRE)free_krbhs.$(OBJEXT)   \
@@ -88,7 +89,6 @@ OBJS= \
        $(OUTPRE)read_msg.$(OBJEXT)     \
        $(OUTPRE)read_pwd.$(OBJEXT)     \
        $(OUTPRE)realm_dom.$(OBJEXT)    \
-       $(OUTPRE)realm_iter.$(OBJEXT)   \
        $(OUTPRE)sendto_kdc.$(OBJEXT)   \
        $(OUTPRE)sn2princ.$(OBJEXT)     \
         $(OUTPRE)thread_safe.$(OBJEXT)  \
@@ -106,6 +106,7 @@ SRCS= \
        $(srcdir)/def_realm.c   \
        $(srcdir)/ccdefname.c   \
        $(srcdir)/changepw.c    \
+       $(srcdir)/cm.c          \
        $(srcdir)/dnsglue.c     \
        $(srcdir)/dnssrv.c      \
        $(srcdir)/free_krbhs.c  \
@@ -131,7 +132,6 @@ SRCS= \
        $(srcdir)/read_msg.c    \
        $(srcdir)/read_pwd.c    \
        $(srcdir)/realm_dom.c   \
-       $(srcdir)/realm_iter.c  \
        $(srcdir)/port2ip.c     \
        $(srcdir)/sendto_kdc.c  \
        $(srcdir)/sn2princ.c    \
@@ -144,7 +144,7 @@ SRCS= \
        $(srcdir)/write_msg.c
 
 EXTRADEPSRCS = \
-       t_an_to_ln.c t_gifconf.c t_locate_kdc.c t_realm_iter.c \
+       t_an_to_ln.c t_gifconf.c t_locate_kdc.c \
        t_std_conf.c
 
 ##DOS##LIBOBJS = $(OBJS)
@@ -155,7 +155,7 @@ clean-unix:: clean-libobjs
 shared:
        mkdir shared
 
-TEST_PROGS= t_std_conf t_an_to_ln t_kuserok t_locate_kdc
+TEST_PROGS= t_std_conf t_an_to_ln t_kuserok t_locate_kdc t_trace
 
 T_STD_CONF_OBJS= t_std_conf.o 
 
@@ -163,7 +163,7 @@ T_AN_TO_LN_OBJS = t_an_to_ln.o an_to_ln.o
 
 T_KUSEROK_OBJS = t_kuserok.o
 
-T_REALM_ITER_OBJS = t_realm_iter.o realm_iter.o
+T_TRACE_OBJS = t_trace.o
 
 t_std_conf: $(T_STD_CONF_OBJS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_std_conf $(T_STD_CONF_OBJS) $(KRB5_BASE_LIBS)
@@ -174,9 +174,6 @@ t_an_to_ln: $(T_AN_TO_LN_OBJS) $(KRB5_BASE_DEPLIBS)
 t_kuserok: $(T_KUSEROK_OBJS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_kuserok $(T_KUSEROK_OBJS) $(KRB5_BASE_LIBS)
 
-t_realm_iter: $(T_REALM_ITER_OBJS) $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) -o t_realm_iter $(T_REALM_ITER_OBJS) $(KRB5_BASE_LIBS)
-
 t_localaddr: localaddr.c
        $(CC_LINK) $(ALL_CFLAGS) -DTEST -o t_localaddr $(srcdir)/localaddr.c $(KRB5_BASE_LIBS) $(LIBS)
 
@@ -188,6 +185,9 @@ $(OUTPRE)t_locate_kdc.exe: $(OUTPRE)t_locate_kdc.obj \
                $(KLIB) $(PLIB) $(CLIB) $(SLIB)
        link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(DNSLIBS)
 
+t_trace: $(T_TRACE_OBJS) $(KRB5_BASE_DEPLIBS)
+       $(CC_LINK) -o t_trace $(T_TRACE_OBJS) $(KRB5_BASE_LIBS)
+
 LCLINT=lclint
 LCLINTOPTS= -warnposix \
        -usedef +charintliteral +ignoresigns -predboolint +boolint \
@@ -197,7 +197,8 @@ lclint-localaddr: localaddr.c
        $(LCLINT) $(LCLINTOPTS) $(CPPFLAGS) $(LOCALINCLUDES) $(DEFS) \
                -DTEST $(srcdir)/localaddr.c
 
-check-unix:: check-unix-stdconf check-unix-locate check-unix-antoln t_kuserok
+check-unix:: check-unix-stdconf check-unix-locate check-unix-antoln \
+       check-unix-trace t_kuserok
 
 check-unix-stdconf:: t_std_conf
        KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
@@ -259,6 +260,10 @@ check-unix-antoln:: t_an_to_ln
        $(KRB5_RUN_ENV) $(VALGRIND) ./t_an_to_ln fred/r@r barney/r@r x/r/r/r@r
        $(RM) ./t_an.*
 
+check-unix-trace:: t_trace
+       export KRB5_TRACE=/dev/stdout ; \
+       $(KRB5_RUN_ENV) $(VALGRIND) ./t_trace
+
 clean:: 
        $(RM) $(TEST_PROGS) test.out t_std_conf.o t_an_to_ln.o t_locate_kdc.o
        $(RM) t_kuserok.o