pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk
[krb5.git] / src / util / support / Makefile.in
index 5a8fcff163ecc99d82559a2ba2c99507fe31ec4b..88520438fa34cc61ab541208917d2dbc72fd90bf 100644 (file)
@@ -1,13 +1,14 @@
-thisconfigdir=../..
-myfulldir=util/support
-mydir=util/support
+mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
+DEFS=
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
+##DOS##WIN64LIBNAME=$(OUTPRE)k5sprt64.lib
 ##DOS##XTRA=
 ##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst
+##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst
 
 SED = sed
 
@@ -16,21 +17,72 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 LIBBASE=krb5support
-LIBMAJOR=0
-LIBMINOR=0
+LIBMAJOR=@SUPPORTLIB_MAJOR@
+LIBMINOR=1
 
 LIBINITFUNC=krb5int_thread_support_init
 LIBFINIFUNC=krb5int_thread_support_fini
 
+MKSTEMP_ST_OBJ= @MKSTEMP_ST_OBJ@
+MKSTEMP_OBJ= @MKSTEMP_OBJ@
+##DOS##MKSTEMP_ST_OBJ= mkstemp.o
+##DOS##MKSTEMP_OBJ= $(OUTPRE)mkstemp.$(OBJEXT)
+
+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 \
        init-addrinfo.o \
-       fake-addrinfo.o
+       plugins.o \
+       errors.o \
+       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)
 
 LIBOBJS= \
        $(OUTPRE)threads.$(OBJEXT) \
        $(OUTPRE)init-addrinfo.$(OBJEXT) \
-       $(OUTPRE)fake-addrinfo.$(OBJEXT)
+       $(OUTPRE)plugins.$(OBJEXT) \
+       $(OUTPRE)errors.$(OBJEXT) \
+       $(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)
 
 STOBJLISTS=OBJS.ST
 
@@ -41,10 +93,22 @@ LOCALINCLUDES=-I. -I$(srcdir)
 SRCS=\
        $(srcdir)/threads.c \
        $(srcdir)/init-addrinfo.c \
-       $(srcdir)/fake-addrinfo.c
+       $(srcdir)/errors.c \
+       $(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_unal.c \
+       $(srcdir)/zap.c
+
 SHLIB_EXPDEPS =
 # Add -lm if dumping thread stats, for sqrt.
-SHLIB_EXPLIBS= $(LIBS)
+SHLIB_EXPLIBS= $(LIBS) $(DL_LIB)
 SHLIB_DIRS=
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
@@ -58,29 +122,51 @@ install-unix:: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 ##DOS##!if 0
-$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
-       (cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h)
+$(BUILDTOP)/include/autoconf.h: $(top_srcdir)/include/autoconf.h.in
+       (cd $(BUILDTOP)/include; $(MAKE) autoconf.h)
 ##DOS##!endif
 
-# @lib_frag@
-# @libobj_frag@
+t_mktime: gmt_mktime.c
+       $(CC) $(ALL_CFLAGS) -DTEST_LEAP -o t_mktime $(srcdir)/gmt_mktime.c
+
+SHLIB_EXPORT_FILE=libkrb5support.exports
+##DOS##all-windows:: libkrb5support.exports
+
+EXTRA_SUPPORT_SYMS= @EXTRA_SUPPORT_SYMS@
+##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
+       cat $(srcdir)/libkrb5support-fixed.exports > new-exports
+       for i in $(EXTRA_SUPPORT_SYMS) .; do \
+         if test "$$i" != .; then echo $$i >> new-exports; else :; fi ; \
+       done
+       $(MV) new-exports libkrb5support.exports
+##DOS##!endif
+##DOS##libkrb5support.exports: libkrb5support-fixed.exports Makefile
+##DOS##        $(CP) libkrb5support-fixed.exports new-exports
+##DOS##        for %%x in ($(EXTRA_SUPPORT_SYMS) .) do if not %%x==. echo %%x >> new-exports
+##DOS##        $(RM) libkrb5support.exports
+##DOS##        $(MV) new-exports libkrb5support.exports
+
+T_K5BUF_OBJS= t_k5buf.o k5buf.o $(PRINTF_ST_OBJ)
+
+t_k5buf: $(T_K5BUF_OBJS)
+       $(CC_LINK) -o t_k5buf $(T_K5BUF_OBJS)
+
+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 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): threads.c \
-  $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/k5-platform.h cache-addrinfo.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/fake-addrinfo.h
-init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \
-  init-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \
-  cache-addrinfo.h
-fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \
-  fake-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
-  $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \
-  cache-addrinfo.h