Merge branch 't/testsuite'

diff --combined Makefile.in
index c64b5ae7250ce5cceb178f39089319ae38894a11,a246f4c161832b7f182ea5a457cdc6d435768c4b..e6b6ecc27367d12f46d189c3c75036d09acc1bb6
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -9,6 -9,7 +9,7 @@@ PACKAGE_VERSION := @PACKAGE_VERSION
  PACKAGE_STRING := @PACKAGE_STRING@
  install_sh := @install_sh@
  cmdline_dir := @cmdline_dir@
+ executables := @executables@
  
  build_date := $(shell date)
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@@ -67,6 -68,7 +68,7 @@@ man_pages_in := $(patsubst %, web/%.man
  ggo_dir := ggo
  object_dir := objects
  man_dir := man/man1
+ test_dir := t
  
  m4_ggos := afh audioc audiod client filter gui recv server write
  all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
@@@ -93,16 -95,15 +95,16 @@@ endi
  ifndef BUILD_VERBOSE
        BUILD_VERBOSE = 0
  endif
- ifeq ($(BUILD_VERBOSE),1)
-       Q =
- else
+ ifeq ($(BUILD_VERBOSE),0)
        Q = @
+ else
+       Q =
  endif
  
 -.PHONY: all clean distclean maintainer-clean install man tarball\
 +.PHONY: dep all clean distclean maintainer-clean install man tarball\
        .FORCE-GIT-VERSION-FILE
 -all: @executables@ $(man_pages)
 +all: dep @executables@ $(man_pages)
 +dep: $(deps)
  man: $(man_pages)
  tarball: $(tarball)
  
@@@ -225,10 -226,8 +227,10 @@@ all_objs := $(recv_objs) $(filter_objs
        $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
        $(write_objs) $(afh_objs)
  
 +deps := $(all_objs:.o=.d)
 +
  ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 --include $(all_objs:.o=.d)
 +-include $(deps)
  endif
  
  para_recv: $(recv_objs)
@@@ -280,7 -279,7 +282,7 @@@ clean2: clea
        $(Q) rm -rf man $(object_dir)
        $(Q) rm -f *_command_list.*
  
- distclean: clean2
+ distclean: clean2 test-clean
        @[ -z "$(Q)" ] || echo 'DISTCLEAN'
        $(Q) rm -f Makefile autoscan.log config.status config.log
        $(Q) rm -rf autom4te.cache aclocal.m4
@@@ -316,3 -315,4 +318,4 @@@ $(tarball): $(cmdline_generated
  %.pdf: %.ps
        ps2pdf - - < $< > $@
  
+ include $(test_dir)/makefile.test