Merge branch 'feature/upstream' into develop

1 files changed, 294 insertions, 144 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 632d4ab..356dcfe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,18 +93,19 @@ host_triplet = @host@
 @HAVE_DLFCN_H_TRUE@am__append_1 = libHX_rtcheck.la
 @WITH_GNU_LD_TRUE@am__append_2 = -Wl,--version-script=${srcdir}/libHX.map
 @MINGW32_TRUE@am__append_3 = ux-file.c ux-mmap.c
-@B_PROC_TRUE@am__append_4 = proc.c
+@MINGW32_TRUE@am__append_4 = -lws2_32
 @WITH_GNU_LD_TRUE@am__append_5 = -Wl,--version-script=${srcdir}/libHX.map
 check_PROGRAMS = tc-compile$(EXEEXT) tc-cast$(EXEEXT) \
 	tc-deque$(EXEEXT) tc-dir$(EXEEXT) tc-format$(EXEEXT) \
-	tc-link$(EXEEXT) tc-list$(EXEEXT) tc-list2$(EXEEXT) \
+	tc-io$(EXEEXT) tc-list$(EXEEXT) tc-list2$(EXEEXT) \
 	tc-map$(EXEEXT) tc-memmem$(EXEEXT) tc-misc$(EXEEXT) \
 	tc-netio$(EXEEXT) tc-option$(EXEEXT) tc-proc$(EXEEXT) \
 	tc-rand$(EXEEXT) tc-realpath$(EXEEXT) tc-shconfig$(EXEEXT) \
 	tc-strchr2$(EXEEXT) tc-string$(EXEEXT) tc-strquote$(EXEEXT) \
-	tc-time$(EXEEXT) $(am__EXEEXT_1)
+	tc-switchuser$(EXEEXT) tc-time$(EXEEXT) $(am__EXEEXT_1)
 TESTS = tc-strchr2$(EXEEXT) tc-strquote$(EXEEXT) $(am__EXEEXT_2)
-@HAVE_CXX_TRUE@am__append_6 = tx-compile tx-cast tx-deque tx-dir tx-list tx-list2 \
+@HAVE_CXX_TRUE@am__append_6 = tx-compile tx-cast tx-deque tx-dir \
+@HAVE_CXX_TRUE@                     tx-intdiff tx-list tx-list2 \
 @HAVE_CXX_TRUE@                     tx-misc tx-netio \
 @HAVE_CXX_TRUE@                     tx-option tx-proc tx-rand tx-strchr2 tx-string \
 @HAVE_CXX_TRUE@                     tx-strquote tx-time
@@ -123,6 +124,14 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@HAVE_CXX_TRUE@am__EXEEXT_1 = tx-compile$(EXEEXT) tx-cast$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-deque$(EXEEXT) tx-dir$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-intdiff$(EXEEXT) tx-list$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-list2$(EXEEXT) tx-misc$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-netio$(EXEEXT) tx-option$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-proc$(EXEEXT) tx-rand$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-strchr2$(EXEEXT) tx-string$(EXEEXT) \
+@HAVE_CXX_TRUE@	tx-strquote$(EXEEXT) tx-time$(EXEEXT)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -154,14 +163,14 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libHX_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__libHX_la_SOURCES_DIST = deque.c dl.c format.c io.c map.c mc.c \
-	misc.c opt.c rand.c string.c time.c ux-file.c ux-mmap.c proc.c
+	misc.c opt.c proc.c rand.c socket.c string.c time.c ux-file.c \
+	ux-mmap.c
 @MINGW32_TRUE@am__objects_1 = ux-file.lo ux-mmap.lo
-@B_PROC_TRUE@am__objects_2 = proc.lo
 am_libHX_la_OBJECTS = deque.lo dl.lo format.lo io.lo map.lo mc.lo \
-	misc.lo opt.lo rand.lo string.lo time.lo $(am__objects_1) \
-	$(am__objects_2)
+	misc.lo opt.lo proc.lo rand.lo socket.lo string.lo time.lo \
+	$(am__objects_1)
 libHX_la_OBJECTS = $(am_libHX_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -178,14 +187,6 @@ libHX_rtcheck_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_CFLAGS) $(CFLAGS) $(libHX_rtcheck_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @HAVE_DLFCN_H_TRUE@am_libHX_rtcheck_la_rpath = -rpath $(libdir)
-@HAVE_CXX_TRUE@am__EXEEXT_1 = tx-compile$(EXEEXT) tx-cast$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-deque$(EXEEXT) tx-dir$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-list$(EXEEXT) tx-list2$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-misc$(EXEEXT) tx-netio$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-option$(EXEEXT) tx-proc$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-rand$(EXEEXT) tx-strchr2$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-string$(EXEEXT) tx-strquote$(EXEEXT) \
-@HAVE_CXX_TRUE@	tx-time$(EXEEXT)
 tc_cast_SOURCES = tc-cast.c
 tc_cast_OBJECTS = tc_cast-tc-cast.$(OBJEXT)
 tc_cast_DEPENDENCIES = libHX.la
@@ -204,9 +205,9 @@ tc_dir_DEPENDENCIES = libHX.la
 tc_format_SOURCES = tc-format.c
 tc_format_OBJECTS = tc-format.$(OBJEXT)
 tc_format_DEPENDENCIES = libHX.la
-tc_link_SOURCES = tc-link.c
-tc_link_OBJECTS = tc-link.$(OBJEXT)
-tc_link_DEPENDENCIES = libHX.la
+tc_io_SOURCES = tc-io.c
+tc_io_OBJECTS = tc-io.$(OBJEXT)
+tc_io_DEPENDENCIES = libHX.la
 tc_list_SOURCES = tc-list.c
 tc_list_OBJECTS = tc-list.$(OBJEXT)
 tc_list_DEPENDENCIES = libHX.la
@@ -252,16 +253,16 @@ tc_string_DEPENDENCIES = libHX.la
 tc_strquote_SOURCES = tc-strquote.c
 tc_strquote_OBJECTS = tc-strquote.$(OBJEXT)
 tc_strquote_DEPENDENCIES = libHX.la
+tc_switchuser_SOURCES = tc-switchuser.c
+tc_switchuser_OBJECTS = tc-switchuser.$(OBJEXT)
+tc_switchuser_DEPENDENCIES = libHX.la
 tc_time_SOURCES = tc-time.c
 tc_time_OBJECTS = tc-time.$(OBJEXT)
 tc_time_DEPENDENCIES = libHX.la
 am__tx_cast_SOURCES_DIST = tx-cast.cpp
-@HAVE_CXX_TRUE@am_tx_cast_OBJECTS = tx_cast-tx-cast.$(OBJEXT)
+@HAVE_CXX_TRUE@am_tx_cast_OBJECTS = tx-cast.$(OBJEXT)
 tx_cast_OBJECTS = $(am_tx_cast_OBJECTS)
 @HAVE_CXX_TRUE@tx_cast_DEPENDENCIES = libHX.la
-tx_cast_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tx_cast_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am__tx_compile_SOURCES_DIST = tx-compile.cpp
 @HAVE_CXX_TRUE@am_tx_compile_OBJECTS = tx-compile.$(OBJEXT)
 tx_compile_OBJECTS = $(am_tx_compile_OBJECTS)
@@ -274,6 +275,10 @@ am__tx_dir_SOURCES_DIST = tx-dir.cpp
 @HAVE_CXX_TRUE@am_tx_dir_OBJECTS = tx-dir.$(OBJEXT)
 tx_dir_OBJECTS = $(am_tx_dir_OBJECTS)
 @HAVE_CXX_TRUE@tx_dir_DEPENDENCIES = libHX.la
+am__tx_intdiff_SOURCES_DIST = tx-intdiff.cpp
+@HAVE_CXX_TRUE@am_tx_intdiff_OBJECTS = tx-intdiff.$(OBJEXT)
+tx_intdiff_OBJECTS = $(am_tx_intdiff_OBJECTS)
+tx_intdiff_LDADD = $(LDADD)
 am__tx_list_SOURCES_DIST = tx-list.cpp
 @HAVE_CXX_TRUE@am_tx_list_OBJECTS = tx-list.$(OBJEXT)
 tx_list_OBJECTS = $(am_tx_list_OBJECTS)
@@ -335,7 +340,33 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/deque.Plo ./$(DEPDIR)/dl.Plo \
+	./$(DEPDIR)/format.Plo ./$(DEPDIR)/io.Plo ./$(DEPDIR)/map.Plo \
+	./$(DEPDIR)/mc.Plo ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/opt.Plo \
+	./$(DEPDIR)/proc.Plo ./$(DEPDIR)/rand.Plo \
+	./$(DEPDIR)/rtcheck.Plo ./$(DEPDIR)/socket.Plo \
+	./$(DEPDIR)/string.Plo ./$(DEPDIR)/tc-compile.Po \
+	./$(DEPDIR)/tc-deque.Po ./$(DEPDIR)/tc-dir.Po \
+	./$(DEPDIR)/tc-format.Po ./$(DEPDIR)/tc-io.Po \
+	./$(DEPDIR)/tc-list.Po ./$(DEPDIR)/tc-map.Po \
+	./$(DEPDIR)/tc-memmem.Po ./$(DEPDIR)/tc-misc.Po \
+	./$(DEPDIR)/tc-netio.Po ./$(DEPDIR)/tc-option.Po \
+	./$(DEPDIR)/tc-proc.Po ./$(DEPDIR)/tc-rand.Po \
+	./$(DEPDIR)/tc-realpath.Po ./$(DEPDIR)/tc-shconfig.Po \
+	./$(DEPDIR)/tc-strchr2.Po ./$(DEPDIR)/tc-string.Po \
+	./$(DEPDIR)/tc-strquote.Po ./$(DEPDIR)/tc-switchuser.Po \
+	./$(DEPDIR)/tc-time.Po ./$(DEPDIR)/tc_cast-tc-cast.Po \
+	./$(DEPDIR)/tc_list2-tc-list2.Po ./$(DEPDIR)/time.Plo \
+	./$(DEPDIR)/tx-cast.Po ./$(DEPDIR)/tx-compile.Po \
+	./$(DEPDIR)/tx-deque.Po ./$(DEPDIR)/tx-dir.Po \
+	./$(DEPDIR)/tx-intdiff.Po ./$(DEPDIR)/tx-list.Po \
+	./$(DEPDIR)/tx-misc.Po ./$(DEPDIR)/tx-netio.Po \
+	./$(DEPDIR)/tx-option.Po ./$(DEPDIR)/tx-proc.Po \
+	./$(DEPDIR)/tx-rand.Po ./$(DEPDIR)/tx-strchr2.Po \
+	./$(DEPDIR)/tx-string.Po ./$(DEPDIR)/tx-strquote.Po \
+	./$(DEPDIR)/tx-time.Po ./$(DEPDIR)/tx_list2-tx-list2.Po \
+	./$(DEPDIR)/ux-file.Plo ./$(DEPDIR)/ux-mmap.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -374,23 +405,25 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 SOURCES = $(libHX_la_SOURCES) $(libHX_rtcheck_la_SOURCES) tc-cast.c \
-	tc-compile.c tc-deque.c tc-dir.c tc-format.c tc-link.c \
-	tc-list.c tc-list2.c tc-map.c tc-memmem.c tc-misc.c tc-netio.c \
+	tc-compile.c tc-deque.c tc-dir.c tc-format.c tc-io.c tc-list.c \
+	tc-list2.c tc-map.c tc-memmem.c tc-misc.c tc-netio.c \
 	tc-option.c tc-proc.c tc-rand.c tc-realpath.c tc-shconfig.c \
-	tc-strchr2.c tc-string.c tc-strquote.c tc-time.c \
-	$(tx_cast_SOURCES) $(tx_compile_SOURCES) $(tx_deque_SOURCES) \
-	$(tx_dir_SOURCES) $(tx_list_SOURCES) $(tx_list2_SOURCES) \
-	$(tx_misc_SOURCES) $(tx_netio_SOURCES) $(tx_option_SOURCES) \
-	$(tx_proc_SOURCES) $(tx_rand_SOURCES) $(tx_strchr2_SOURCES) \
-	$(tx_string_SOURCES) $(tx_strquote_SOURCES) $(tx_time_SOURCES)
+	tc-strchr2.c tc-string.c tc-strquote.c tc-switchuser.c \
+	tc-time.c $(tx_cast_SOURCES) $(tx_compile_SOURCES) \
+	$(tx_deque_SOURCES) $(tx_dir_SOURCES) $(tx_intdiff_SOURCES) \
+	$(tx_list_SOURCES) $(tx_list2_SOURCES) $(tx_misc_SOURCES) \
+	$(tx_netio_SOURCES) $(tx_option_SOURCES) $(tx_proc_SOURCES) \
+	$(tx_rand_SOURCES) $(tx_strchr2_SOURCES) $(tx_string_SOURCES) \
+	$(tx_strquote_SOURCES) $(tx_time_SOURCES)
 DIST_SOURCES = $(am__libHX_la_SOURCES_DIST) \
 	$(libHX_rtcheck_la_SOURCES) tc-cast.c tc-compile.c tc-deque.c \
-	tc-dir.c tc-format.c tc-link.c tc-list.c tc-list2.c tc-map.c \
+	tc-dir.c tc-format.c tc-io.c tc-list.c tc-list2.c tc-map.c \
 	tc-memmem.c tc-misc.c tc-netio.c tc-option.c tc-proc.c \
 	tc-rand.c tc-realpath.c tc-shconfig.c tc-strchr2.c tc-string.c \
-	tc-strquote.c tc-time.c $(am__tx_cast_SOURCES_DIST) \
-	$(am__tx_compile_SOURCES_DIST) $(am__tx_deque_SOURCES_DIST) \
-	$(am__tx_dir_SOURCES_DIST) $(am__tx_list_SOURCES_DIST) \
+	tc-strquote.c tc-switchuser.c tc-time.c \
+	$(am__tx_cast_SOURCES_DIST) $(am__tx_compile_SOURCES_DIST) \
+	$(am__tx_deque_SOURCES_DIST) $(am__tx_dir_SOURCES_DIST) \
+	$(am__tx_intdiff_SOURCES_DIST) $(am__tx_list_SOURCES_DIST) \
 	$(am__tx_list2_SOURCES_DIST) $(am__tx_misc_SOURCES_DIST) \
 	$(am__tx_netio_SOURCES_DIST) $(am__tx_option_SOURCES_DIST) \
 	$(am__tx_proc_SOURCES_DIST) $(am__tx_rand_SOURCES_DIST) \
@@ -418,8 +451,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
@@ -575,6 +606,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 @HAVE_CXX_TRUE@am__EXEEXT_2 = tx-strchr2$(EXEEXT) tx-strquote$(EXEEXT)
@@ -613,8 +645,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -629,8 +662,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -646,7 +681,6 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LYX = @LYX@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -723,6 +757,7 @@ psdir = @psdir@
 regular_CFLAGS = @regular_CFLAGS@
 regular_CPPFLAGS = @regular_CPPFLAGS@
 regular_CXXFLAGS = @regular_CXXFLAGS@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -736,9 +771,10 @@ AM_CFLAGS = ${regular_CFLAGS}
 AM_CXXFLAGS = ${regular_CXXFLAGS}
 lib_LTLIBRARIES = libHX.la $(am__append_1)
 libHX_la_SOURCES = deque.c dl.c format.c io.c map.c mc.c misc.c opt.c \
-	rand.c string.c time.c $(am__append_3) $(am__append_4)
-libHX_la_LIBADD = ${libdl_LIBS} ${libpthread_LIBS} ${librt_LIBS}
-libHX_la_LDFLAGS = -no-undefined -version-info 32:0:0 $(am__append_2)
+	proc.c rand.c socket.c string.c time.c $(am__append_3)
+libHX_la_LIBADD = ${libdl_LIBS} -lm ${libpthread_LIBS} ${librt_LIBS} \
+	$(am__append_4)
+libHX_la_LDFLAGS = -no-undefined -version-info 35:0:3 $(am__append_2)
 EXTRA_libHX_la_DEPENDENCIES = libHX.map
 libHX_rtcheck_la_SOURCES = rtcheck.c
 libHX_rtcheck_la_LIBADD = ${libdl_LIBS}
@@ -750,7 +786,7 @@ tc_cast_LDADD = libHX.la -lm
 tc_compile_LDADD = libHX.la
 tc_dir_LDADD = libHX.la
 tc_format_LDADD = libHX.la
-tc_link_LDADD = libHX.la
+tc_io_LDADD = libHX.la
 tc_list_LDADD = libHX.la
 tc_list2_LDADD = libHX.la
 tc_list2_CFLAGS = ${AM_CFLAGS} -O2 -fstrict-aliasing
@@ -766,15 +802,16 @@ tc_shconfig_LDADD = libHX.la
 tc_strchr2_LDADD = libHX.la
 tc_string_LDADD = libHX.la
 tc_strquote_LDADD = libHX.la
+tc_switchuser_LDADD = libHX.la
 tc_time_LDADD = libHX.la
 @HAVE_CXX_TRUE@tx_cast_SOURCES = tx-cast.cpp
-@HAVE_CXX_TRUE@tx_cast_CXXFLAGS = ${AM_CXXFLAGS} -std=c++98
 @HAVE_CXX_TRUE@tx_cast_LDADD = libHX.la -lm
 @HAVE_CXX_TRUE@tx_compile_SOURCES = tx-compile.cpp
 @HAVE_CXX_TRUE@tx_compile_LDADD = libHX.la
 @HAVE_CXX_TRUE@tx_deque_SOURCES = tx-deque.cpp
 @HAVE_CXX_TRUE@tx_dir_SOURCES = tx-dir.cpp
 @HAVE_CXX_TRUE@tx_dir_LDADD = libHX.la
+@HAVE_CXX_TRUE@tx_intdiff_SOURCES = tx-intdiff.cpp
 @HAVE_CXX_TRUE@tx_list_SOURCES = tx-list.cpp
 @HAVE_CXX_TRUE@tx_list_LDADD = libHX.la
 @HAVE_CXX_TRUE@tx_list2_SOURCES = tx-list2.cpp
@@ -819,8 +856,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -832,6 +869,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -873,15 +919,6 @@ libHX.la: $(libHX_la_OBJECTS) $(libHX_la_DEPENDENCIES) $(EXTRA_libHX_la_DEPENDEN
 libHX_rtcheck.la: $(libHX_rtcheck_la_OBJECTS) $(libHX_rtcheck_la_DEPENDENCIES) $(EXTRA_libHX_rtcheck_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libHX_rtcheck_la_LINK) $(am_libHX_rtcheck_la_rpath) $(libHX_rtcheck_la_OBJECTS) $(libHX_rtcheck_la_LIBADD) $(LIBS)
 
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
 tc-cast$(EXEEXT): $(tc_cast_OBJECTS) $(tc_cast_DEPENDENCIES) $(EXTRA_tc_cast_DEPENDENCIES) 
 	@rm -f tc-cast$(EXEEXT)
 	$(AM_V_CCLD)$(tc_cast_LINK) $(tc_cast_OBJECTS) $(tc_cast_LDADD) $(LIBS)
@@ -902,9 +939,9 @@ tc-format$(EXEEXT): $(tc_format_OBJECTS) $(tc_format_DEPENDENCIES) $(EXTRA_tc_fo
 	@rm -f tc-format$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tc_format_OBJECTS) $(tc_format_LDADD) $(LIBS)
 
-tc-link$(EXEEXT): $(tc_link_OBJECTS) $(tc_link_DEPENDENCIES) $(EXTRA_tc_link_DEPENDENCIES) 
-	@rm -f tc-link$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(tc_link_OBJECTS) $(tc_link_LDADD) $(LIBS)
+tc-io$(EXEEXT): $(tc_io_OBJECTS) $(tc_io_DEPENDENCIES) $(EXTRA_tc_io_DEPENDENCIES) 
+	@rm -f tc-io$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(tc_io_OBJECTS) $(tc_io_LDADD) $(LIBS)
 
 tc-list$(EXEEXT): $(tc_list_OBJECTS) $(tc_list_DEPENDENCIES) $(EXTRA_tc_list_DEPENDENCIES) 
 	@rm -f tc-list$(EXEEXT)
@@ -962,13 +999,17 @@ tc-strquote$(EXEEXT): $(tc_strquote_OBJECTS) $(tc_strquote_DEPENDENCIES) $(EXTRA
 	@rm -f tc-strquote$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tc_strquote_OBJECTS) $(tc_strquote_LDADD) $(LIBS)
 
+tc-switchuser$(EXEEXT): $(tc_switchuser_OBJECTS) $(tc_switchuser_DEPENDENCIES) $(EXTRA_tc_switchuser_DEPENDENCIES) 
+	@rm -f tc-switchuser$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(tc_switchuser_OBJECTS) $(tc_switchuser_LDADD) $(LIBS)
+
 tc-time$(EXEEXT): $(tc_time_OBJECTS) $(tc_time_DEPENDENCIES) $(EXTRA_tc_time_DEPENDENCIES) 
 	@rm -f tc-time$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tc_time_OBJECTS) $(tc_time_LDADD) $(LIBS)
 
 tx-cast$(EXEEXT): $(tx_cast_OBJECTS) $(tx_cast_DEPENDENCIES) $(EXTRA_tx_cast_DEPENDENCIES) 
 	@rm -f tx-cast$(EXEEXT)
-	$(AM_V_CXXLD)$(tx_cast_LINK) $(tx_cast_OBJECTS) $(tx_cast_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(tx_cast_OBJECTS) $(tx_cast_LDADD) $(LIBS)
 
 tx-compile$(EXEEXT): $(tx_compile_OBJECTS) $(tx_compile_DEPENDENCIES) $(EXTRA_tx_compile_DEPENDENCIES) 
 	@rm -f tx-compile$(EXEEXT)
@@ -982,6 +1023,10 @@ tx-dir$(EXEEXT): $(tx_dir_OBJECTS) $(tx_dir_DEPENDENCIES) $(EXTRA_tx_dir_DEPENDE
 	@rm -f tx-dir$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(tx_dir_OBJECTS) $(tx_dir_LDADD) $(LIBS)
 
+tx-intdiff$(EXEEXT): $(tx_intdiff_OBJECTS) $(tx_intdiff_DEPENDENCIES) $(EXTRA_tx_intdiff_DEPENDENCIES) 
+	@rm -f tx-intdiff$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(tx_intdiff_OBJECTS) $(tx_intdiff_LDADD) $(LIBS)
+
 tx-list$(EXEEXT): $(tx_list_OBJECTS) $(tx_list_DEPENDENCIES) $(EXTRA_tx_list_DEPENDENCIES) 
 	@rm -f tx-list$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(tx_list_OBJECTS) $(tx_list_LDADD) $(LIBS)
@@ -1032,57 +1077,66 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deque.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtcheck.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-compile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-deque.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-format.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-link.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-map.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-memmem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-netio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-option.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-proc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-rand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-realpath.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-shconfig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strchr2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-string.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strquote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-time.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc_cast-tc-cast.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc_list2-tc-list2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-compile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-deque.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-netio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-option.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-proc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-rand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-strchr2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-string.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-strquote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-time.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx_cast-tx-cast.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx_list2-tx-list2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ux-file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ux-mmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deque.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtcheck.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-compile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-deque.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-dir.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-format.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-io.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-map.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-memmem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-misc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-netio.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-option.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-proc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-rand.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-realpath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-shconfig.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strchr2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-string.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-strquote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-switchuser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-time.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc_cast-tc-cast.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc_list2-tc-list2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-cast.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-compile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-deque.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-dir.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-intdiff.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-misc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-netio.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-option.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-proc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-rand.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-strchr2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-string.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-strquote.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx-time.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tx_list2-tx-list2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ux-file.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ux-mmap.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1160,20 +1214,6 @@ tc_list2-tc-list2.obj: tc-list2.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-tx_cast-tx-cast.o: tx-cast.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tx_cast_CXXFLAGS) $(CXXFLAGS) -MT tx_cast-tx-cast.o -MD -MP -MF $(DEPDIR)/tx_cast-tx-cast.Tpo -c -o tx_cast-tx-cast.o `test -f 'tx-cast.cpp' || echo '$(srcdir)/'`tx-cast.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tx_cast-tx-cast.Tpo $(DEPDIR)/tx_cast-tx-cast.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tx-cast.cpp' object='tx_cast-tx-cast.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tx_cast_CXXFLAGS) $(CXXFLAGS) -c -o tx_cast-tx-cast.o `test -f 'tx-cast.cpp' || echo '$(srcdir)/'`tx-cast.cpp
-
-tx_cast-tx-cast.obj: tx-cast.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tx_cast_CXXFLAGS) $(CXXFLAGS) -MT tx_cast-tx-cast.obj -MD -MP -MF $(DEPDIR)/tx_cast-tx-cast.Tpo -c -o tx_cast-tx-cast.obj `if test -f 'tx-cast.cpp'; then $(CYGPATH_W) 'tx-cast.cpp'; else $(CYGPATH_W) '$(srcdir)/tx-cast.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tx_cast-tx-cast.Tpo $(DEPDIR)/tx_cast-tx-cast.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tx-cast.cpp' object='tx_cast-tx-cast.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tx_cast_CXXFLAGS) $(CXXFLAGS) -c -o tx_cast-tx-cast.obj `if test -f 'tx-cast.cpp'; then $(CYGPATH_W) 'tx-cast.cpp'; else $(CYGPATH_W) '$(srcdir)/tx-cast.cpp'; fi`
-
 tx_list2-tx-list2.o: tx-list2.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tx_list2_CXXFLAGS) $(CXXFLAGS) -MT tx_list2-tx-list2.o -MD -MP -MF $(DEPDIR)/tx_list2-tx-list2.Tpo -c -o tx_list2-tx-list2.o `test -f 'tx-list2.cpp' || echo '$(srcdir)/'`tx-list2.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tx_list2-tx-list2.Tpo $(DEPDIR)/tx_list2-tx-list2.Po
@@ -1353,7 +1393,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -1366,7 +1406,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: $(check_PROGRAMS)
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1429,8 +1469,10 @@ tx-strquote.log: tx-strquote$(EXEEXT)
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1465,6 +1507,8 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
+install-checkPROGRAMS: install-libLTLIBRARIES
+
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -1508,7 +1552,60 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/deque.Plo
+	-rm -f ./$(DEPDIR)/dl.Plo
+	-rm -f ./$(DEPDIR)/format.Plo
+	-rm -f ./$(DEPDIR)/io.Plo
+	-rm -f ./$(DEPDIR)/map.Plo
+	-rm -f ./$(DEPDIR)/mc.Plo
+	-rm -f ./$(DEPDIR)/misc.Plo
+	-rm -f ./$(DEPDIR)/opt.Plo
+	-rm -f ./$(DEPDIR)/proc.Plo
+	-rm -f ./$(DEPDIR)/rand.Plo
+	-rm -f ./$(DEPDIR)/rtcheck.Plo
+	-rm -f ./$(DEPDIR)/socket.Plo
+	-rm -f ./$(DEPDIR)/string.Plo
+	-rm -f ./$(DEPDIR)/tc-compile.Po
+	-rm -f ./$(DEPDIR)/tc-deque.Po
+	-rm -f ./$(DEPDIR)/tc-dir.Po
+	-rm -f ./$(DEPDIR)/tc-format.Po
+	-rm -f ./$(DEPDIR)/tc-io.Po
+	-rm -f ./$(DEPDIR)/tc-list.Po
+	-rm -f ./$(DEPDIR)/tc-map.Po
+	-rm -f ./$(DEPDIR)/tc-memmem.Po
+	-rm -f ./$(DEPDIR)/tc-misc.Po
+	-rm -f ./$(DEPDIR)/tc-netio.Po
+	-rm -f ./$(DEPDIR)/tc-option.Po
+	-rm -f ./$(DEPDIR)/tc-proc.Po
+	-rm -f ./$(DEPDIR)/tc-rand.Po
+	-rm -f ./$(DEPDIR)/tc-realpath.Po
+	-rm -f ./$(DEPDIR)/tc-shconfig.Po
+	-rm -f ./$(DEPDIR)/tc-strchr2.Po
+	-rm -f ./$(DEPDIR)/tc-string.Po
+	-rm -f ./$(DEPDIR)/tc-strquote.Po
+	-rm -f ./$(DEPDIR)/tc-switchuser.Po
+	-rm -f ./$(DEPDIR)/tc-time.Po
+	-rm -f ./$(DEPDIR)/tc_cast-tc-cast.Po
+	-rm -f ./$(DEPDIR)/tc_list2-tc-list2.Po
+	-rm -f ./$(DEPDIR)/time.Plo
+	-rm -f ./$(DEPDIR)/tx-cast.Po
+	-rm -f ./$(DEPDIR)/tx-compile.Po
+	-rm -f ./$(DEPDIR)/tx-deque.Po
+	-rm -f ./$(DEPDIR)/tx-dir.Po
+	-rm -f ./$(DEPDIR)/tx-intdiff.Po
+	-rm -f ./$(DEPDIR)/tx-list.Po
+	-rm -f ./$(DEPDIR)/tx-misc.Po
+	-rm -f ./$(DEPDIR)/tx-netio.Po
+	-rm -f ./$(DEPDIR)/tx-option.Po
+	-rm -f ./$(DEPDIR)/tx-proc.Po
+	-rm -f ./$(DEPDIR)/tx-rand.Po
+	-rm -f ./$(DEPDIR)/tx-strchr2.Po
+	-rm -f ./$(DEPDIR)/tx-string.Po
+	-rm -f ./$(DEPDIR)/tx-strquote.Po
+	-rm -f ./$(DEPDIR)/tx-time.Po
+	-rm -f ./$(DEPDIR)/tx_list2-tx-list2.Po
+	-rm -f ./$(DEPDIR)/ux-file.Plo
+	-rm -f ./$(DEPDIR)/ux-mmap.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1554,7 +1651,60 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/deque.Plo
+	-rm -f ./$(DEPDIR)/dl.Plo
+	-rm -f ./$(DEPDIR)/format.Plo
+	-rm -f ./$(DEPDIR)/io.Plo
+	-rm -f ./$(DEPDIR)/map.Plo
+	-rm -f ./$(DEPDIR)/mc.Plo
+	-rm -f ./$(DEPDIR)/misc.Plo
+	-rm -f ./$(DEPDIR)/opt.Plo
+	-rm -f ./$(DEPDIR)/proc.Plo
+	-rm -f ./$(DEPDIR)/rand.Plo
+	-rm -f ./$(DEPDIR)/rtcheck.Plo
+	-rm -f ./$(DEPDIR)/socket.Plo
+	-rm -f ./$(DEPDIR)/string.Plo
+	-rm -f ./$(DEPDIR)/tc-compile.Po
+	-rm -f ./$(DEPDIR)/tc-deque.Po
+	-rm -f ./$(DEPDIR)/tc-dir.Po
+	-rm -f ./$(DEPDIR)/tc-format.Po
+	-rm -f ./$(DEPDIR)/tc-io.Po
+	-rm -f ./$(DEPDIR)/tc-list.Po
+	-rm -f ./$(DEPDIR)/tc-map.Po
+	-rm -f ./$(DEPDIR)/tc-memmem.Po
+	-rm -f ./$(DEPDIR)/tc-misc.Po
+	-rm -f ./$(DEPDIR)/tc-netio.Po
+	-rm -f ./$(DEPDIR)/tc-option.Po
+	-rm -f ./$(DEPDIR)/tc-proc.Po
+	-rm -f ./$(DEPDIR)/tc-rand.Po
+	-rm -f ./$(DEPDIR)/tc-realpath.Po
+	-rm -f ./$(DEPDIR)/tc-shconfig.Po
+	-rm -f ./$(DEPDIR)/tc-strchr2.Po
+	-rm -f ./$(DEPDIR)/tc-string.Po
+	-rm -f ./$(DEPDIR)/tc-strquote.Po
+	-rm -f ./$(DEPDIR)/tc-switchuser.Po
+	-rm -f ./$(DEPDIR)/tc-time.Po
+	-rm -f ./$(DEPDIR)/tc_cast-tc-cast.Po
+	-rm -f ./$(DEPDIR)/tc_list2-tc-list2.Po
+	-rm -f ./$(DEPDIR)/time.Plo
+	-rm -f ./$(DEPDIR)/tx-cast.Po
+	-rm -f ./$(DEPDIR)/tx-compile.Po
+	-rm -f ./$(DEPDIR)/tx-deque.Po
+	-rm -f ./$(DEPDIR)/tx-dir.Po
+	-rm -f ./$(DEPDIR)/tx-intdiff.Po
+	-rm -f ./$(DEPDIR)/tx-list.Po
+	-rm -f ./$(DEPDIR)/tx-misc.Po
+	-rm -f ./$(DEPDIR)/tx-netio.Po
+	-rm -f ./$(DEPDIR)/tx-option.Po
+	-rm -f ./$(DEPDIR)/tx-proc.Po
+	-rm -f ./$(DEPDIR)/tx-rand.Po
+	-rm -f ./$(DEPDIR)/tx-strchr2.Po
+	-rm -f ./$(DEPDIR)/tx-string.Po
+	-rm -f ./$(DEPDIR)/tx-strquote.Po
+	-rm -f ./$(DEPDIR)/tx-time.Po
+	-rm -f ./$(DEPDIR)/tx_list2-tx-list2.Po
+	-rm -f ./$(DEPDIR)/ux-file.Plo
+	-rm -f ./$(DEPDIR)/ux-mmap.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1575,17 +1725,17 @@ uninstall-am: uninstall-libLTLIBRARIES
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am clean clean-checkPROGRAMS clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck tags tags-am uninstall uninstall-am \