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

[krb5.git] / src / util / support / Makefile.in

diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 3cede439443ba11a353f46b98430670a28ffa578..88520438fa34cc61ab541208917d2dbc72fd90bf 100644 (file)
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -1,6 +1,4 @@
-thisconfigdir=../..
-myfulldir=util/support
-mydir=util/support
+mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
 DEFS=
@@ -32,9 +30,27 @@ MKSTEMP_OBJ= @MKSTEMP_OBJ@
 
 STRLCPY_ST_OBJ=@STRLCPY_ST_OBJ@
 STRLCPY_OBJ=@STRLCPY_OBJ@
+##DOS##STRLCPY_ST_OBJ= strlcpy.o
+##DOS##STRLCPY_OBJ= $(OUTPRE)strlcpy.$(OBJEXT)
 
 PRINTF_ST_OBJ= @PRINTF_ST_OBJ@
 PRINTF_OBJ= @PRINTF_OBJ@
+##DOS##PRINTF_ST_OBJ= printf.o
+##DOS##PRINTF_OBJ= $(OUTPRE)printf.$(OBJEXT)
+
+IPC_ST_OBJ=
+IPC_OBJ=
+##DOS##IPC_ST_OBJ= ipc_stream.o
+##DOS##IPC_OBJ= $(OUTPRE)ipc_stream.$(OBJEXT)
+IPC_SYMS= \
+       krb5int_ipc_stream_data krb5int_ipc_stream_new \
+       krb5int_ipc_stream_write krb5int_ipc_stream_read \
+       krb5int_ipc_stream_read_int32 krb5int_ipc_stream_write_int32 \
+       krb5int_ipc_stream_read_int64 krb5int_ipc_stream_write_int64 \
+       krb5int_ipc_stream_read_uint32 krb5int_ipc_stream_write_uint32 \
+       krb5int_ipc_stream_read_string krb5int_ipc_stream_write_string \
+       krb5int_ipc_stream_release krb5int_ipc_stream_size \
+       krb5int_ipc_stream_free_string
 
 STLIBOBJS= \
        threads.o \
@@ -44,6 +60,10 @@ STLIBOBJS= \
        k5buf.o \
        gmt_mktime.o \
        fake-addrinfo.o \
+       utf8.o \
+       utf8_conv.o \
+       zap.o \
+       $(IPC_ST_OBJ) \
        $(STRLCPY_ST_OBJ) \
        $(PRINTF_ST_OBJ) \
        $(MKSTEMP_ST_OBJ)
@@ -56,6 +76,10 @@ LIBOBJS= \
        $(OUTPRE)k5buf.$(OBJEXT) \
        $(OUTPRE)gmt_mktime.$(OBJEXT) \
        $(OUTPRE)fake-addrinfo.$(OBJEXT) \
+       $(OUTPRE)utf8.$(OBJEXT) \
+       $(OUTPRE)utf8_conv.$(OBJEXT) \
+       $(OUTPRE)zap.$(OBJEXT) \
+       $(IPC_OBJ) \
        $(STRLCPY_OBJ) \
        $(PRINTF_OBJ) \
        $(MKSTEMP_OBJ)
@@ -73,10 +97,14 @@ SRCS=\
        $(srcdir)/k5buf.c \
        $(srcdir)/gmt_mktime.c \
        $(srcdir)/fake-addrinfo.c \
+       $(srcdir)/utf8.c \
+       $(srcdir)/utf8_conv.c \
        $(srcdir)/strlcpy.c \
        $(srcdir)/printf.c \
        $(srcdir)/mkstemp.c \
-       $(srcdir)/t_k5buf.c
+       $(srcdir)/t_k5buf.c \
+       $(srcdir)/t_unal.c \
+       $(srcdir)/zap.c
 
 SHLIB_EXPDEPS =
 # Add -lm if dumping thread stats, for sqrt.
@@ -94,7 +122,7 @@ install-unix:: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 ##DOS##!if 0
-$(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in
+$(BUILDTOP)/include/autoconf.h: $(top_srcdir)/include/autoconf.h.in
        (cd $(BUILDTOP)/include; $(MAKE) autoconf.h)
 ##DOS##!endif
 
@@ -105,7 +133,8 @@ SHLIB_EXPORT_FILE=libkrb5support.exports
 ##DOS##all-windows:: libkrb5support.exports
 
 EXTRA_SUPPORT_SYMS= @EXTRA_SUPPORT_SYMS@
-##DOS##EXTRA_SUPPORT_SYMS= krb5int_mkstemp
+##DOS##EXTRA_SUPPORT_SYMS= krb5int_mkstemp krb5int_strlcpy krb5int_strlcat \
+##DOS##                krb5int_vasprintf krb5int_asprintf $(IPC_SYMS)
 
 ##DOS##!if 0
 libkrb5support.exports: $(srcdir)/libkrb5support-fixed.exports Makefile
@@ -126,55 +155,18 @@ T_K5BUF_OBJS= t_k5buf.o k5buf.o $(PRINTF_ST_OBJ)
 t_k5buf: $(T_K5BUF_OBJS)
        $(CC_LINK) -o t_k5buf $(T_K5BUF_OBJS)
 
-TEST_PROGS= t_k5buf
+t_unal: t_unal.o
+       $(CC_LINK) -o t_unal t_unal.o
+
+TEST_PROGS= t_k5buf t_unal
 
 check-unix:: $(TEST_PROGS)
        ./t_k5buf
+       ./t_unal
 
 clean::
-       $(RM) t_k5buf.o t_k5buf
+       $(RM) t_k5buf.o t_k5buf t_unal.o t_unal
 
 @lib_frag@
 @libobj_frag@
 
-# +++ Dependency line eater +++
-# 
-# Makefile dependencies follow.  This must be the last section in
-# the Makefile.in file
-#
-threads.so threads.po $(OUTPRE)threads.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/socket-utils.h cache-addrinfo.h supp-int.h \
-  threads.c
-init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
-  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  cache-addrinfo.h init-addrinfo.c
-errors.so errors.po $(OUTPRE)errors.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h errors.c supp-int.h
-k5buf.so k5buf.po $(OUTPRE)k5buf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h k5buf-int.h k5buf.c
-gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-gmt_mktime.h \
-  gmt_mktime.c
-fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
-  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
-  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  cache-addrinfo.h fake-addrinfo.c supp-int.h
-strlcpy.so strlcpy.po $(OUTPRE)strlcpy.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
-  strlcpy.c
-printf.so printf.po $(OUTPRE)printf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
-  printf.c
-mkstemp.so mkstemp.po $(OUTPRE)mkstemp.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
-  mkstemp.c
-t_k5buf.so t_k5buf.po $(OUTPRE)t_k5buf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h k5buf-int.h t_k5buf.c