removed the unit description dialog in favor of unit help

2004-08-18 02:51:23 +00:00 · 2004-08-18 02:51:23 +00:00 · c3d2f8abe9
commit c3d2f8abe9
parent 2e5f3cb240
21 changed files with 634 additions and 684 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -78,12 +78,6 @@ man6dir = $(mandir)/man6
 am__installdirs = "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(pkgdatadir)"
 NROFF = nroff
 MANS = $(dist_man6_MANS)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 nobase_dist_pkgdataDATA_INSTALL = $(install_sh_DATA)
 DATA = $(dist_noinst_DATA) $(nobase_dist_pkgdata_DATA)
 ETAGS = etags
@ -239,8 +233,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -388,19 +380,25 @@ uninstall-man6:
 install-nobase_dist_pkgdataDATA: $(nobase_dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-	@$(am__vpath_adj_setup) \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__vpath_adj) \
+	  case $$p in \
+	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+	    *) f=$$p;; \
+	  esac; \
 	  echo " $(nobase_dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  $(nobase_dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done

 uninstall-nobase_dist_pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@$(am__vpath_adj_setup) \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
-	  $(am__vpath_adj) \
+	  case $$p in \
+	    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+	    *) f=$$p;; \
+	  esac; \
 	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@ -478,16 +476,14 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
-	  empty_fix=.; \
 	else \
 	  include_option=--include; \
-	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
+	    test -f $$subdir/TAGS && \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@ -497,11 +493,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -555,17 +549,15 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -576,15 +568,15 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)

 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)

 dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)

 dist-shar: distdir
@ -597,7 +589,7 @@ dist-zip: distdir
 	$(am__remove_distdir)

 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)

 # This target untars the dist file and tries a VPATH configuration.  Then
@ -606,13 +598,13 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@ -695,7 +687,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@ -770,7 +762,7 @@ uninstall-man: uninstall-man6
 	maintainer-clean-generic maintainer-clean-recursive \
 	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-hook uninstall-info-am uninstall-man uninstall-man6 \
+	uninstall-info-am uninstall-man uninstall-man6 \
 	uninstall-nobase_dist_pkgdataDATA


--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.3 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@ -33,14 +33,14 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])

 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9])])
+	 [AM_AUTOMAKE_VERSION([1.8.3])])

 # AM_AUX_DIR_EXPAND

@ -108,7 +108,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

 # AM_CONDITIONAL                                              -*- Autoconf -*-

-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -145,8 +145,8 @@ else
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
+  AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
 fi])])

 # serial 7						-*- Autoconf -*-
@ -266,14 +266,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
        am_cv_$1_dependencies_compiler_type=$depmode
        break
      fi
@ -319,8 +314,7 @@ AC_SUBST([AMDEPBACKSLASH])

 # Generate code to set up dependency tracking.   -*- Autoconf -*-

-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -356,21 +350,27 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  else
    continue
  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  # When using ansi2knr, U may be empty or an underscore; expand it
  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
    # Make sure the directory exists.
    test -f "$dirpart/$file" && continue
@ -401,7 +401,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
@ -477,6 +477,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@ -485,9 +486,7 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                  [_AM_DEPENDENCIES(CC)],
@ -770,21 +769,13 @@ fi
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
+  # Keeping the `.' argument allows $(mkdir_p) to be used without
+  # argument.  Indeed, we sometimes output rules like
  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
+  # where $(somedir) is conditionally defined.
+  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+  # expensive solution, as it forces Make to start a sub-shell.)
+  mkdir_p='mkdir -p -- .'
 else
  # On NextStep and OpenStep, the `mkdir' command does not
  # recognize any option.  It will interpret all options as
@ -950,114 +941,6 @@ fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
 m4_include([m4/codeset.m4])
 m4_include([m4/gettext.m4])
 m4_include([m4/glibc21.m4])
--- a/502
+++ b/502
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -64,16 +64,7 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 am__dist_gnome1desktop_DATA_DIST = wesnoth.desktop
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(gnome1desktopdir)" \
-	"$(DESTDIR)$(gnome2desktopdir)" "$(DESTDIR)$(kdedesktopdir)" \
-	"$(DESTDIR)$(gnome1icondir)" "$(DESTDIR)$(gnome2icondir)" \
-	"$(DESTDIR)$(kdeicondir)"
+am__installdirs = "$(DESTDIR)$(gnome1desktopdir)" "$(DESTDIR)$(gnome2desktopdir)" "$(DESTDIR)$(kdedesktopdir)" "$(DESTDIR)$(gnome1icondir)" "$(DESTDIR)$(gnome2icondir)" "$(DESTDIR)$(kdeicondir)"
 dist_gnome1desktopDATA_INSTALL = $(INSTALL_DATA)
 am__dist_gnome2desktop_DATA_DIST = wesnoth.desktop
 dist_gnome2desktopDATA_INSTALL = $(INSTALL_DATA)
@ -224,8 +215,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -305,7 +294,7 @@ install-dist_gnome1desktopDATA: $(dist_gnome1desktop_DATA)
 	test -z "$(gnome1desktopdir)" || $(mkdir_p) "$(DESTDIR)$(gnome1desktopdir)"
 	@list='$(dist_gnome1desktop_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(dist_gnome1desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnome1desktopdir)/$$f'"; \
 	  $(dist_gnome1desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnome1desktopdir)/$$f"; \
 	done
@ -313,7 +302,7 @@ install-dist_gnome1desktopDATA: $(dist_gnome1desktop_DATA)
 uninstall-dist_gnome1desktopDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_gnome1desktop_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(gnome1desktopdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(gnome1desktopdir)/$$f"; \
 	done
@ -322,7 +311,7 @@ install-dist_gnome2desktopDATA: $(dist_gnome2desktop_DATA)
 	test -z "$(gnome2desktopdir)" || $(mkdir_p) "$(DESTDIR)$(gnome2desktopdir)"
 	@list='$(dist_gnome2desktop_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(dist_gnome2desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnome2desktopdir)/$$f'"; \
 	  $(dist_gnome2desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnome2desktopdir)/$$f"; \
 	done
@ -330,7 +319,7 @@ install-dist_gnome2desktopDATA: $(dist_gnome2desktop_DATA)
 uninstall-dist_gnome2desktopDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_gnome2desktop_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(gnome2desktopdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(gnome2desktopdir)/$$f"; \
 	done
@ -339,7 +328,7 @@ install-dist_kdedesktopDATA: $(dist_kdedesktop_DATA)
 	test -z "$(kdedesktopdir)" || $(mkdir_p) "$(DESTDIR)$(kdedesktopdir)"
 	@list='$(dist_kdedesktop_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(dist_kdedesktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdedesktopdir)/$$f'"; \
 	  $(dist_kdedesktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdedesktopdir)/$$f"; \
 	done
@ -347,7 +336,7 @@ install-dist_kdedesktopDATA: $(dist_kdedesktop_DATA)
 uninstall-dist_kdedesktopDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_kdedesktop_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(kdedesktopdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(kdedesktopdir)/$$f"; \
 	done
@ -356,7 +345,7 @@ install-gnome1iconDATA: $(gnome1icon_DATA)
 	test -z "$(gnome1icondir)" || $(mkdir_p) "$(DESTDIR)$(gnome1icondir)"
 	@list='$(gnome1icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(gnome1iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnome1icondir)/$$f'"; \
 	  $(gnome1iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnome1icondir)/$$f"; \
 	done
@ -364,7 +353,7 @@ install-gnome1iconDATA: $(gnome1icon_DATA)
 uninstall-gnome1iconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(gnome1icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(gnome1icondir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(gnome1icondir)/$$f"; \
 	done
@ -373,7 +362,7 @@ install-gnome2iconDATA: $(gnome2icon_DATA)
 	test -z "$(gnome2icondir)" || $(mkdir_p) "$(DESTDIR)$(gnome2icondir)"
 	@list='$(gnome2icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(gnome2iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnome2icondir)/$$f'"; \
 	  $(gnome2iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnome2icondir)/$$f"; \
 	done
@ -381,7 +370,7 @@ install-gnome2iconDATA: $(gnome2icon_DATA)
 uninstall-gnome2iconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(gnome2icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(gnome2icondir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(gnome2icondir)/$$f"; \
 	done
@ -390,7 +379,7 @@ install-kdeiconDATA: $(kdeicon_DATA)
 	test -z "$(kdeicondir)" || $(mkdir_p) "$(DESTDIR)$(kdeicondir)"
 	@list='$(kdeicon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(kdeiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeicondir)/$$f'"; \
 	  $(kdeiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeicondir)/$$f"; \
 	done
@ -398,7 +387,7 @@ install-kdeiconDATA: $(kdeicon_DATA)
 uninstall-kdeiconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(kdeicon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f '$(DESTDIR)$(kdeicondir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(kdeicondir)/$$f"; \
 	done
@ -462,7 +451,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -198,8 +198,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -319,7 +317,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- a/po/Makefile
+++ b/po/Makefile
@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..


-prefix = /export/work/yann/wesnoth/localgettext
+prefix = /usr/local
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
--- a/po/Makefile.in
+++ b/po/Makefile.in
@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..


-prefix = /export/work/yann/wesnoth/localgettext
+prefix = /usr/local
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -128,6 +128,49 @@ wesnoth_editor_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/about.Po ./$(DEPDIR)/actions.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ai.Po ./$(DEPDIR)/ai_attack.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/ai_move.Po ./$(DEPDIR)/builder.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/button.Po ./$(DEPDIR)/cavegen.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/clipboard.Po ./$(DEPDIR)/combo.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/config.Po ./$(DEPDIR)/cursor.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dialogs.Po ./$(DEPDIR)/display.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor_dialogs.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor_layout.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor_main.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor_palettes.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/editor_undo.Po ./$(DEPDIR)/events.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/file_chooser.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesystem.Po ./$(DEPDIR)/font.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game.Po ./$(DEPDIR)/game_config.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game_events.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gamestatus.Po ./$(DEPDIR)/halo.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/help.Po ./$(DEPDIR)/hotkeys.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/image.Po ./$(DEPDIR)/intro.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/key.Po ./$(DEPDIR)/language.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/log.Po ./$(DEPDIR)/map.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/map_label.Po ./$(DEPDIR)/map_manip.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mapgen.Po ./$(DEPDIR)/mapgen_dialog.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/menu.Po ./$(DEPDIR)/mouse.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/multiplayer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/multiplayer_client.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/multiplayer_connect.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/multiplayer_lobby.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/network.Po ./$(DEPDIR)/pathfind.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/playlevel.Po ./$(DEPDIR)/playturn.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/preferences.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/progressbar.Po ./$(DEPDIR)/race.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/replay.Po ./$(DEPDIR)/reports.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/scrollbar.Po ./$(DEPDIR)/sdl_utils.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/show_dialog.Po ./$(DEPDIR)/slider.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sound.Po ./$(DEPDIR)/statistics.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/team.Po ./$(DEPDIR)/terrain.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/textbox.Po ./$(DEPDIR)/theme.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/titlescreen.Po ./$(DEPDIR)/tooltips.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/unit.Po ./$(DEPDIR)/unit_display.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/unit_types.Po ./$(DEPDIR)/video.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/widget.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@ -222,7 +265,8 @@ LIBOBJS = @LIBOBJS@
 LIBPNG_FALSE = @LIBPNG_FALSE@
 LIBPNG_TRUE = @LIBPNG_TRUE@
 LIBS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @SDL_MIXER_LIBS@ @SDL_NET_LIBS@ \
-	@SDL_TTF_LIBS@ @LIBINTL@ $(am__append_7)
+	@SDL_TTF_LIBS@ @LIBINTL@\
+$(am__append_7)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@ -289,8 +333,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -749,238 +791,272 @@ distclean-compile:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<

 .cpp.obj:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 button.o: widgets/button.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.o -MD -MP -MF "$(DEPDIR)/button.Tpo" -c -o button.o `test -f 'widgets/button.cpp' || echo '$(srcdir)/'`widgets/button.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button.Tpo" "$(DEPDIR)/button.Po"; else rm -f "$(DEPDIR)/button.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/button.cpp' object='button.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/button.Po' tmpdepfile='$(DEPDIR)/button.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button.o `test -f 'widgets/button.cpp' || echo '$(srcdir)/'`widgets/button.cpp

 button.obj: widgets/button.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT button.obj -MD -MP -MF "$(DEPDIR)/button.Tpo" -c -o button.obj `if test -f 'widgets/button.cpp'; then $(CYGPATH_W) 'widgets/button.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/button.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/button.Tpo" "$(DEPDIR)/button.Po"; else rm -f "$(DEPDIR)/button.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/button.cpp' object='button.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/button.Po' tmpdepfile='$(DEPDIR)/button.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o button.obj `if test -f 'widgets/button.cpp'; then $(CYGPATH_W) 'widgets/button.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/button.cpp'; fi`

 file_chooser.o: widgets/file_chooser.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_chooser.o -MD -MP -MF "$(DEPDIR)/file_chooser.Tpo" -c -o file_chooser.o `test -f 'widgets/file_chooser.cpp' || echo '$(srcdir)/'`widgets/file_chooser.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_chooser.Tpo" "$(DEPDIR)/file_chooser.Po"; else rm -f "$(DEPDIR)/file_chooser.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/file_chooser.cpp' object='file_chooser.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/file_chooser.Po' tmpdepfile='$(DEPDIR)/file_chooser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o file_chooser.o `test -f 'widgets/file_chooser.cpp' || echo '$(srcdir)/'`widgets/file_chooser.cpp

 file_chooser.obj: widgets/file_chooser.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT file_chooser.obj -MD -MP -MF "$(DEPDIR)/file_chooser.Tpo" -c -o file_chooser.obj `if test -f 'widgets/file_chooser.cpp'; then $(CYGPATH_W) 'widgets/file_chooser.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/file_chooser.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_chooser.Tpo" "$(DEPDIR)/file_chooser.Po"; else rm -f "$(DEPDIR)/file_chooser.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/file_chooser.cpp' object='file_chooser.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/file_chooser.Po' tmpdepfile='$(DEPDIR)/file_chooser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o file_chooser.obj `if test -f 'widgets/file_chooser.cpp'; then $(CYGPATH_W) 'widgets/file_chooser.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/file_chooser.cpp'; fi`

 combo.o: widgets/combo.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo.o -MD -MP -MF "$(DEPDIR)/combo.Tpo" -c -o combo.o `test -f 'widgets/combo.cpp' || echo '$(srcdir)/'`widgets/combo.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/combo.Tpo" "$(DEPDIR)/combo.Po"; else rm -f "$(DEPDIR)/combo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/combo.cpp' object='combo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/combo.Po' tmpdepfile='$(DEPDIR)/combo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o combo.o `test -f 'widgets/combo.cpp' || echo '$(srcdir)/'`widgets/combo.cpp

 combo.obj: widgets/combo.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT combo.obj -MD -MP -MF "$(DEPDIR)/combo.Tpo" -c -o combo.obj `if test -f 'widgets/combo.cpp'; then $(CYGPATH_W) 'widgets/combo.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/combo.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/combo.Tpo" "$(DEPDIR)/combo.Po"; else rm -f "$(DEPDIR)/combo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/combo.cpp' object='combo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/combo.Po' tmpdepfile='$(DEPDIR)/combo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o combo.obj `if test -f 'widgets/combo.cpp'; then $(CYGPATH_W) 'widgets/combo.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/combo.cpp'; fi`

 menu.o: widgets/menu.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.o -MD -MP -MF "$(DEPDIR)/menu.Tpo" -c -o menu.o `test -f 'widgets/menu.cpp' || echo '$(srcdir)/'`widgets/menu.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/menu.Tpo" "$(DEPDIR)/menu.Po"; else rm -f "$(DEPDIR)/menu.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/menu.cpp' object='menu.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/menu.Po' tmpdepfile='$(DEPDIR)/menu.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu.o `test -f 'widgets/menu.cpp' || echo '$(srcdir)/'`widgets/menu.cpp

 menu.obj: widgets/menu.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT menu.obj -MD -MP -MF "$(DEPDIR)/menu.Tpo" -c -o menu.obj `if test -f 'widgets/menu.cpp'; then $(CYGPATH_W) 'widgets/menu.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/menu.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/menu.Tpo" "$(DEPDIR)/menu.Po"; else rm -f "$(DEPDIR)/menu.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/menu.cpp' object='menu.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/menu.Po' tmpdepfile='$(DEPDIR)/menu.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o menu.obj `if test -f 'widgets/menu.cpp'; then $(CYGPATH_W) 'widgets/menu.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/menu.cpp'; fi`

 progressbar.o: widgets/progressbar.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progressbar.o -MD -MP -MF "$(DEPDIR)/progressbar.Tpo" -c -o progressbar.o `test -f 'widgets/progressbar.cpp' || echo '$(srcdir)/'`widgets/progressbar.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/progressbar.Tpo" "$(DEPDIR)/progressbar.Po"; else rm -f "$(DEPDIR)/progressbar.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/progressbar.cpp' object='progressbar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/progressbar.Po' tmpdepfile='$(DEPDIR)/progressbar.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o progressbar.o `test -f 'widgets/progressbar.cpp' || echo '$(srcdir)/'`widgets/progressbar.cpp

 progressbar.obj: widgets/progressbar.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT progressbar.obj -MD -MP -MF "$(DEPDIR)/progressbar.Tpo" -c -o progressbar.obj `if test -f 'widgets/progressbar.cpp'; then $(CYGPATH_W) 'widgets/progressbar.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/progressbar.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/progressbar.Tpo" "$(DEPDIR)/progressbar.Po"; else rm -f "$(DEPDIR)/progressbar.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/progressbar.cpp' object='progressbar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/progressbar.Po' tmpdepfile='$(DEPDIR)/progressbar.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o progressbar.obj `if test -f 'widgets/progressbar.cpp'; then $(CYGPATH_W) 'widgets/progressbar.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/progressbar.cpp'; fi`

 scrollbar.o: widgets/scrollbar.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT scrollbar.o -MD -MP -MF "$(DEPDIR)/scrollbar.Tpo" -c -o scrollbar.o `test -f 'widgets/scrollbar.cpp' || echo '$(srcdir)/'`widgets/scrollbar.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/scrollbar.Tpo" "$(DEPDIR)/scrollbar.Po"; else rm -f "$(DEPDIR)/scrollbar.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/scrollbar.cpp' object='scrollbar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/scrollbar.Po' tmpdepfile='$(DEPDIR)/scrollbar.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scrollbar.o `test -f 'widgets/scrollbar.cpp' || echo '$(srcdir)/'`widgets/scrollbar.cpp

 scrollbar.obj: widgets/scrollbar.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT scrollbar.obj -MD -MP -MF "$(DEPDIR)/scrollbar.Tpo" -c -o scrollbar.obj `if test -f 'widgets/scrollbar.cpp'; then $(CYGPATH_W) 'widgets/scrollbar.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/scrollbar.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/scrollbar.Tpo" "$(DEPDIR)/scrollbar.Po"; else rm -f "$(DEPDIR)/scrollbar.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/scrollbar.cpp' object='scrollbar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/scrollbar.Po' tmpdepfile='$(DEPDIR)/scrollbar.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scrollbar.obj `if test -f 'widgets/scrollbar.cpp'; then $(CYGPATH_W) 'widgets/scrollbar.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/scrollbar.cpp'; fi`

 slider.o: widgets/slider.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT slider.o -MD -MP -MF "$(DEPDIR)/slider.Tpo" -c -o slider.o `test -f 'widgets/slider.cpp' || echo '$(srcdir)/'`widgets/slider.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/slider.Tpo" "$(DEPDIR)/slider.Po"; else rm -f "$(DEPDIR)/slider.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/slider.cpp' object='slider.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/slider.Po' tmpdepfile='$(DEPDIR)/slider.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o slider.o `test -f 'widgets/slider.cpp' || echo '$(srcdir)/'`widgets/slider.cpp

 slider.obj: widgets/slider.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT slider.obj -MD -MP -MF "$(DEPDIR)/slider.Tpo" -c -o slider.obj `if test -f 'widgets/slider.cpp'; then $(CYGPATH_W) 'widgets/slider.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/slider.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/slider.Tpo" "$(DEPDIR)/slider.Po"; else rm -f "$(DEPDIR)/slider.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/slider.cpp' object='slider.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/slider.Po' tmpdepfile='$(DEPDIR)/slider.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o slider.obj `if test -f 'widgets/slider.cpp'; then $(CYGPATH_W) 'widgets/slider.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/slider.cpp'; fi`

 textbox.o: widgets/textbox.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textbox.o -MD -MP -MF "$(DEPDIR)/textbox.Tpo" -c -o textbox.o `test -f 'widgets/textbox.cpp' || echo '$(srcdir)/'`widgets/textbox.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/textbox.Tpo" "$(DEPDIR)/textbox.Po"; else rm -f "$(DEPDIR)/textbox.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/textbox.cpp' object='textbox.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/textbox.Po' tmpdepfile='$(DEPDIR)/textbox.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textbox.o `test -f 'widgets/textbox.cpp' || echo '$(srcdir)/'`widgets/textbox.cpp

 textbox.obj: widgets/textbox.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT textbox.obj -MD -MP -MF "$(DEPDIR)/textbox.Tpo" -c -o textbox.obj `if test -f 'widgets/textbox.cpp'; then $(CYGPATH_W) 'widgets/textbox.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/textbox.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/textbox.Tpo" "$(DEPDIR)/textbox.Po"; else rm -f "$(DEPDIR)/textbox.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/textbox.cpp' object='textbox.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/textbox.Po' tmpdepfile='$(DEPDIR)/textbox.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o textbox.obj `if test -f 'widgets/textbox.cpp'; then $(CYGPATH_W) 'widgets/textbox.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/textbox.cpp'; fi`

 widget.o: widgets/widget.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.o -MD -MP -MF "$(DEPDIR)/widget.Tpo" -c -o widget.o `test -f 'widgets/widget.cpp' || echo '$(srcdir)/'`widgets/widget.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget.Tpo" "$(DEPDIR)/widget.Po"; else rm -f "$(DEPDIR)/widget.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/widget.cpp' object='widget.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/widget.Po' tmpdepfile='$(DEPDIR)/widget.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget.o `test -f 'widgets/widget.cpp' || echo '$(srcdir)/'`widgets/widget.cpp

 widget.obj: widgets/widget.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT widget.obj -MD -MP -MF "$(DEPDIR)/widget.Tpo" -c -o widget.obj `if test -f 'widgets/widget.cpp'; then $(CYGPATH_W) 'widgets/widget.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/widget.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/widget.Tpo" "$(DEPDIR)/widget.Po"; else rm -f "$(DEPDIR)/widget.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='widgets/widget.cpp' object='widget.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/widget.Po' tmpdepfile='$(DEPDIR)/widget.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o widget.obj `if test -f 'widgets/widget.cpp'; then $(CYGPATH_W) 'widgets/widget.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/widget.cpp'; fi`

 editor.o: editor/editor.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor.o -MD -MP -MF "$(DEPDIR)/editor.Tpo" -c -o editor.o `test -f 'editor/editor.cpp' || echo '$(srcdir)/'`editor/editor.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor.Tpo" "$(DEPDIR)/editor.Po"; else rm -f "$(DEPDIR)/editor.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor.cpp' object='editor.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor.Po' tmpdepfile='$(DEPDIR)/editor.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor.o `test -f 'editor/editor.cpp' || echo '$(srcdir)/'`editor/editor.cpp

 editor.obj: editor/editor.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor.obj -MD -MP -MF "$(DEPDIR)/editor.Tpo" -c -o editor.obj `if test -f 'editor/editor.cpp'; then $(CYGPATH_W) 'editor/editor.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor.Tpo" "$(DEPDIR)/editor.Po"; else rm -f "$(DEPDIR)/editor.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor.cpp' object='editor.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor.Po' tmpdepfile='$(DEPDIR)/editor.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor.obj `if test -f 'editor/editor.cpp'; then $(CYGPATH_W) 'editor/editor.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor.cpp'; fi`

 editor_layout.o: editor/editor_layout.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_layout.o -MD -MP -MF "$(DEPDIR)/editor_layout.Tpo" -c -o editor_layout.o `test -f 'editor/editor_layout.cpp' || echo '$(srcdir)/'`editor/editor_layout.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_layout.Tpo" "$(DEPDIR)/editor_layout.Po"; else rm -f "$(DEPDIR)/editor_layout.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_layout.cpp' object='editor_layout.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_layout.Po' tmpdepfile='$(DEPDIR)/editor_layout.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_layout.o `test -f 'editor/editor_layout.cpp' || echo '$(srcdir)/'`editor/editor_layout.cpp

 editor_layout.obj: editor/editor_layout.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_layout.obj -MD -MP -MF "$(DEPDIR)/editor_layout.Tpo" -c -o editor_layout.obj `if test -f 'editor/editor_layout.cpp'; then $(CYGPATH_W) 'editor/editor_layout.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_layout.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_layout.Tpo" "$(DEPDIR)/editor_layout.Po"; else rm -f "$(DEPDIR)/editor_layout.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_layout.cpp' object='editor_layout.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_layout.Po' tmpdepfile='$(DEPDIR)/editor_layout.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_layout.obj `if test -f 'editor/editor_layout.cpp'; then $(CYGPATH_W) 'editor/editor_layout.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_layout.cpp'; fi`

 map_manip.o: editor/map_manip.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_manip.o -MD -MP -MF "$(DEPDIR)/map_manip.Tpo" -c -o map_manip.o `test -f 'editor/map_manip.cpp' || echo '$(srcdir)/'`editor/map_manip.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map_manip.Tpo" "$(DEPDIR)/map_manip.Po"; else rm -f "$(DEPDIR)/map_manip.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/map_manip.cpp' object='map_manip.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/map_manip.Po' tmpdepfile='$(DEPDIR)/map_manip.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map_manip.o `test -f 'editor/map_manip.cpp' || echo '$(srcdir)/'`editor/map_manip.cpp

 map_manip.obj: editor/map_manip.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT map_manip.obj -MD -MP -MF "$(DEPDIR)/map_manip.Tpo" -c -o map_manip.obj `if test -f 'editor/map_manip.cpp'; then $(CYGPATH_W) 'editor/map_manip.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/map_manip.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/map_manip.Tpo" "$(DEPDIR)/map_manip.Po"; else rm -f "$(DEPDIR)/map_manip.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/map_manip.cpp' object='map_manip.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/map_manip.Po' tmpdepfile='$(DEPDIR)/map_manip.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o map_manip.obj `if test -f 'editor/map_manip.cpp'; then $(CYGPATH_W) 'editor/map_manip.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/map_manip.cpp'; fi`

 editor_palettes.o: editor/editor_palettes.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_palettes.o -MD -MP -MF "$(DEPDIR)/editor_palettes.Tpo" -c -o editor_palettes.o `test -f 'editor/editor_palettes.cpp' || echo '$(srcdir)/'`editor/editor_palettes.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_palettes.Tpo" "$(DEPDIR)/editor_palettes.Po"; else rm -f "$(DEPDIR)/editor_palettes.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_palettes.cpp' object='editor_palettes.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_palettes.Po' tmpdepfile='$(DEPDIR)/editor_palettes.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_palettes.o `test -f 'editor/editor_palettes.cpp' || echo '$(srcdir)/'`editor/editor_palettes.cpp

 editor_palettes.obj: editor/editor_palettes.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_palettes.obj -MD -MP -MF "$(DEPDIR)/editor_palettes.Tpo" -c -o editor_palettes.obj `if test -f 'editor/editor_palettes.cpp'; then $(CYGPATH_W) 'editor/editor_palettes.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_palettes.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_palettes.Tpo" "$(DEPDIR)/editor_palettes.Po"; else rm -f "$(DEPDIR)/editor_palettes.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_palettes.cpp' object='editor_palettes.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_palettes.Po' tmpdepfile='$(DEPDIR)/editor_palettes.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_palettes.obj `if test -f 'editor/editor_palettes.cpp'; then $(CYGPATH_W) 'editor/editor_palettes.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_palettes.cpp'; fi`

 editor_main.o: editor/editor_main.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_main.o -MD -MP -MF "$(DEPDIR)/editor_main.Tpo" -c -o editor_main.o `test -f 'editor/editor_main.cpp' || echo '$(srcdir)/'`editor/editor_main.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_main.Tpo" "$(DEPDIR)/editor_main.Po"; else rm -f "$(DEPDIR)/editor_main.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_main.cpp' object='editor_main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_main.Po' tmpdepfile='$(DEPDIR)/editor_main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_main.o `test -f 'editor/editor_main.cpp' || echo '$(srcdir)/'`editor/editor_main.cpp

 editor_main.obj: editor/editor_main.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_main.obj -MD -MP -MF "$(DEPDIR)/editor_main.Tpo" -c -o editor_main.obj `if test -f 'editor/editor_main.cpp'; then $(CYGPATH_W) 'editor/editor_main.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_main.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_main.Tpo" "$(DEPDIR)/editor_main.Po"; else rm -f "$(DEPDIR)/editor_main.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_main.cpp' object='editor_main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_main.Po' tmpdepfile='$(DEPDIR)/editor_main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_main.obj `if test -f 'editor/editor_main.cpp'; then $(CYGPATH_W) 'editor/editor_main.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_main.cpp'; fi`

 editor_dialogs.o: editor/editor_dialogs.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_dialogs.o -MD -MP -MF "$(DEPDIR)/editor_dialogs.Tpo" -c -o editor_dialogs.o `test -f 'editor/editor_dialogs.cpp' || echo '$(srcdir)/'`editor/editor_dialogs.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_dialogs.Tpo" "$(DEPDIR)/editor_dialogs.Po"; else rm -f "$(DEPDIR)/editor_dialogs.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_dialogs.cpp' object='editor_dialogs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_dialogs.Po' tmpdepfile='$(DEPDIR)/editor_dialogs.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_dialogs.o `test -f 'editor/editor_dialogs.cpp' || echo '$(srcdir)/'`editor/editor_dialogs.cpp

 editor_dialogs.obj: editor/editor_dialogs.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_dialogs.obj -MD -MP -MF "$(DEPDIR)/editor_dialogs.Tpo" -c -o editor_dialogs.obj `if test -f 'editor/editor_dialogs.cpp'; then $(CYGPATH_W) 'editor/editor_dialogs.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_dialogs.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_dialogs.Tpo" "$(DEPDIR)/editor_dialogs.Po"; else rm -f "$(DEPDIR)/editor_dialogs.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_dialogs.cpp' object='editor_dialogs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_dialogs.Po' tmpdepfile='$(DEPDIR)/editor_dialogs.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_dialogs.obj `if test -f 'editor/editor_dialogs.cpp'; then $(CYGPATH_W) 'editor/editor_dialogs.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_dialogs.cpp'; fi`

 editor_undo.o: editor/editor_undo.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_undo.o -MD -MP -MF "$(DEPDIR)/editor_undo.Tpo" -c -o editor_undo.o `test -f 'editor/editor_undo.cpp' || echo '$(srcdir)/'`editor/editor_undo.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_undo.Tpo" "$(DEPDIR)/editor_undo.Po"; else rm -f "$(DEPDIR)/editor_undo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_undo.cpp' object='editor_undo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_undo.Po' tmpdepfile='$(DEPDIR)/editor_undo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_undo.o `test -f 'editor/editor_undo.cpp' || echo '$(srcdir)/'`editor/editor_undo.cpp

 editor_undo.obj: editor/editor_undo.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT editor_undo.obj -MD -MP -MF "$(DEPDIR)/editor_undo.Tpo" -c -o editor_undo.obj `if test -f 'editor/editor_undo.cpp'; then $(CYGPATH_W) 'editor/editor_undo.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_undo.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/editor_undo.Tpo" "$(DEPDIR)/editor_undo.Po"; else rm -f "$(DEPDIR)/editor_undo.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='editor/editor_undo.cpp' object='editor_undo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/editor_undo.Po' tmpdepfile='$(DEPDIR)/editor_undo.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o editor_undo.obj `if test -f 'editor/editor_undo.cpp'; then $(CYGPATH_W) 'editor/editor_undo.cpp'; else $(CYGPATH_W) '$(srcdir)/editor/editor_undo.cpp'; fi`
 uninstall-info-am:

@ -1057,16 +1133,14 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
-	  empty_fix=.; \
 	else \
 	  include_option=--include; \
-	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
+	    test -f $$subdir/TAGS && \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@ -1076,11 +1150,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -1134,14 +1206,12 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -1173,7 +1243,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- a/src/dialogs.cpp
+++ b/src/dialogs.cpp
@ -15,6 +15,7 @@
 #include "events.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "help.hpp"
 #include "language.hpp"
 #include "log.hpp"
 #include "playturn.hpp"
@ -808,101 +809,7 @@ void unit_preview_pane::process()

 void show_unit_description(display& disp, const gamemap& map, const unit& u)
 {
-	const std::string description = u.unit_description()
-	                                + "\n\n" + _("See Also...");
-
-	std::vector<std::string> options;
-
-	options.push_back(_("Terrain Modifiers"));
-	options.push_back(_("Resistance"));
-	options.push_back(_("Close Window"));
-
-	const surface profile(image::get_image(u.type().image_profile(),image::SCALED));
-
-	const int res = gui::show_dialog(disp, profile, u.type().language_name(),
-	                                 description,gui::MESSAGE, &options);
-	if(res == 0) {
-		show_unit_terrain_table(disp,map,u);
-	} else if(res == 1) {
-		show_unit_resistance(disp,u);
-	}
-}
-
-void show_unit_resistance(display& disp, const unit& u)
-{
-	std::vector<std::string> items;
-	items.push_back(_("Attack Type") + std::string(",") + _("Resistance"));
-	const std::map<std::string,std::string>& table = u.type().movement_type().damage_table();
-	for(std::map<std::string,std::string>::const_iterator i = table.begin(); i != table.end(); ++i) {
-		int resistance = 100 - atoi(i->second.c_str());
-
-		//if resistance is less than 0, display in red
-		const char prefix = resistance < 0 ? font::BAD_TEXT : font::NULL_MARKUP;
-
-		const std::string& weap = i->first;
-
-		std::stringstream str;
-		str << weap << "," << prefix << resistance << "%";
-		items.push_back(str.str());
-	}
-
-	const events::event_context dialog_events_context;
-	dialogs::unit_preview_pane unit_preview(disp,NULL,u);
-	std::vector<gui::preview_pane*> preview_panes;
-	preview_panes.push_back(&unit_preview);
-
-	gui::show_dialog(disp,NULL,
-	                 u.type().language_name(),
-					 _("Unit resistance table"),
-					 gui::MESSAGE,&items,&preview_panes);
-}
-
-void show_unit_terrain_table(display& disp, const gamemap& map, const unit& u)
-{
-	std::vector<std::string> items;
-	items.push_back(_("Terrain") + std::string(",") +
-	                _("Moves") + "," +
-					_("Defense"));
-
-	const unit_type& type = u.type();
-	const unit_movement_type& move_type = type.movement_type();
-	const std::vector<gamemap::TERRAIN>& terrains = map.get_terrain_precedence();
-	for(std::vector<gamemap::TERRAIN>::const_iterator t =
-	    terrains.begin(); t != terrains.end(); ++t) {
-
-		//exclude fog and shroud
-		if(*t == gamemap::FOGGED || *t == gamemap::VOID_TERRAIN) {
-			continue;
-		}
-
-		const terrain_type& info = map.get_terrain_info(*t);
-		if(!info.is_alias()) {
-			const std::string& name = map.terrain_name(*t);
-			const std::string& lang_name = name;
-			const int moves = move_type.movement_cost(map,*t);
-
-			std::stringstream str;
-			str << lang_name << ",";
-			if(moves < 100)
-				str << moves;
-			else
-				str << "--";
-
-			const int defense = 100 - move_type.defense_modifier(map,*t);
-			str << "," << defense << "%";
-
-			items.push_back(str.str());
-		}
-	}
-
-	const events::event_context dialog_events_context;
-	dialogs::unit_preview_pane unit_preview(disp,NULL,u);
-	std::vector<gui::preview_pane*> preview_panes;
-	preview_panes.push_back(&unit_preview);
-
-	gui::show_dialog(disp,NULL,u.type().language_name(),
-					 _("Terrain Modifiers"),
-					 gui::MESSAGE,&items,&preview_panes);
+	help::show_help(disp,"unit_" + u.type().id());
 }

 } //end namespace dialogs
--- a/src/dialogs.hpp
+++ b/src/dialogs.hpp
@ -87,8 +87,6 @@ private:
 };

 void show_unit_description(display& disp, const gamemap& map, const unit& u);
-void show_unit_resistance(display& disp, const unit& u);
-void show_unit_terrain_table(display& disp, const gamemap& map, const unit& u);

 }

--- a/src/help.cpp
+++ b/src/help.cpp
@ -2068,6 +2068,7 @@ const section *find_section(const section &sec, const std::string &id) {
 }

 void help_browser::show_topic(const std::string &topic_id) {
+	std::cerr << "showing topic '" << topic_id << "'\n";
 	const topic *t = find_topic(toplevel_, topic_id);
 	if (t != NULL) {
 		show_topic(*t);
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@ -46,8 +46,6 @@ HOTKEY_COMMAND string_to_command(const std::string& str)
 		m.insert(val("zoomdefault",HOTKEY_ZOOM_DEFAULT));
 		m.insert(val("fullscreen",HOTKEY_FULLSCREEN));
 		m.insert(val("accelerated",HOTKEY_ACCELERATED));
-		m.insert(val("resistance",HOTKEY_ATTACK_RESISTANCE));
-		m.insert(val("terraintable",HOTKEY_TERRAIN_TABLE));
 		m.insert(val("describeunit",HOTKEY_UNIT_DESCRIPTION));
 		m.insert(val("renameunit",HOTKEY_RENAME_UNIT));
 		m.insert(val("save",HOTKEY_SAVE_GAME));
@ -129,8 +127,6 @@ std::string command_to_description(const HOTKEY_COMMAND &command)
 	case HOTKEY_ZOOM_DEFAULT: return _("Default Zoom");
 	case HOTKEY_FULLSCREEN: return _("Fullscreen");
 	case HOTKEY_ACCELERATED: return _("Accelerated");
-	case HOTKEY_ATTACK_RESISTANCE: return _("Attack Resistance");
-	case HOTKEY_TERRAIN_TABLE: return _("Terrain Table");
 	case HOTKEY_UNIT_DESCRIPTION: return _("Unit Description");
 	case HOTKEY_RENAME_UNIT: return _("Rename Unit");
 	case HOTKEY_SAVE_GAME: return _("Save Game");
@ -436,14 +432,6 @@ void execute_command(display& disp, HOTKEY_COMMAND command, command_executor* ex
 			if(executor)
 				executor->redo();
 			break;
-		case HOTKEY_TERRAIN_TABLE:
-			if(executor)
-				executor->terrain_table();
-			break;
-		case HOTKEY_ATTACK_RESISTANCE:
-			if(executor)
-				executor->attack_resistance();
-			break;
 		case HOTKEY_UNIT_DESCRIPTION:
 			if(executor)
 				executor->unit_description();
--- a/src/hotkeys.hpp
+++ b/src/hotkeys.hpp
@ -27,7 +27,6 @@ enum HOTKEY_COMMAND { HOTKEY_CYCLE_UNITS, HOTKEY_END_UNIT_TURN, HOTKEY_LEADER,
                      HOTKEY_UNDO, HOTKEY_REDO,
                      HOTKEY_ZOOM_IN, HOTKEY_ZOOM_OUT, HOTKEY_ZOOM_DEFAULT,
                      HOTKEY_FULLSCREEN, HOTKEY_ACCELERATED,
-                      HOTKEY_TERRAIN_TABLE, HOTKEY_ATTACK_RESISTANCE,
                      HOTKEY_UNIT_DESCRIPTION, HOTKEY_RENAME_UNIT, HOTKEY_SAVE_GAME, HOTKEY_LOAD_GAME,
                      HOTKEY_RECRUIT, HOTKEY_REPEAT_RECRUIT, HOTKEY_RECALL, HOTKEY_ENDTURN,
                      HOTKEY_TOGGLE_GRID, HOTKEY_STATUS_TABLE, HOTKEY_MUTE,
@ -99,8 +98,6 @@ public:
 	virtual void end_unit_turn() {}
 	virtual void undo() {}
 	virtual void redo() {}
-	virtual void terrain_table() {}
-	virtual void attack_resistance() {}
 	virtual void unit_description() {}
 	virtual void rename_unit() {}
 	virtual void save_game() {}
--- a/src/multiplayer.cpp
+++ b/src/multiplayer.cpp
@ -486,15 +486,22 @@ lobby::RESULT multiplayer_game_setup_dialog::process()

 void multiplayer_game_setup_dialog::start_game()
 {
+	std::cerr << "calling start_game()\n";
+	const network::manager net_manager;
+	const network::server_manager server_man(15000,server_);
+
 	turns_restorer_ = surface_restorer();
 	village_gold_restorer_ = surface_restorer();
 	xp_restorer_ = surface_restorer();
 	playernum_restorer_ = surface_restorer();
 	minimap_restorer_ = surface_restorer();

+	std::cerr << "loading connector...\n";
 	//Connector
 	mp_connect connector(disp_, name_entry_->text(), cfg_, units_data_, state_);

+	std::cerr << "done loading connector...\n";
+
 	const int turns = turns_slider_->value() < turns_slider_->max_value() ?
 		turns_slider_->value() : -1;

@ -510,8 +517,6 @@ void multiplayer_game_setup_dialog::start_game()
 		return;
 	}

-	const network::manager net_manager;
-	const network::server_manager server_man(15000,server_);
 	name_entry_->set_focus(false);

 	//free up widget resources so they're not consumed while the game is on
--- a/src/multiplayer_lobby.cpp
+++ b/src/multiplayer_lobby.cpp
@ -36,6 +36,7 @@ namespace lobby {
 RESULT enter(display& disp, config& game_data, const config& terrain_data, dialog* dlg,
 			 std::vector<std::string>& messages)
 {
+	std::cerr << "entered multiplayer lobby...\n";
 	const preferences::display_manager disp_manager(&disp);
 	const hotkey::basic_handler key_handler(&disp);
 	const video_change_detector disp_change_detector(disp.video());
--- a/src/network.cpp
+++ b/src/network.cpp
@ -153,6 +153,7 @@ manager::manager() : free_(true)
 #endif

 	if(SDLNet_Init() == -1) {
+		std::cerr << "could not initialize SDLNet; throwing error...\n";
 		throw error(SDL_GetError());
 	}

--- a/src/playturn.cpp
+++ b/src/playturn.cpp
@ -971,8 +971,6 @@ bool turn_info::can_execute_command(hotkey::HOTKEY_COMMAND command) const
 		return !browse_ && !commands_disabled;

 	//commands we can only do if there is an active unit
-	case hotkey::HOTKEY_TERRAIN_TABLE:
-	case hotkey::HOTKEY_ATTACK_RESISTANCE:
 	case hotkey::HOTKEY_UNIT_DESCRIPTION:
 		return current_unit() != units_.end();

@ -1341,24 +1339,6 @@ void turn_info::redo()
 	redo_stack_.pop_back();
 }

-void turn_info::terrain_table()
-{
-	unit_map::const_iterator un = current_unit();
-
-	if(un != units_.end()) {
-		dialogs::show_unit_terrain_table(gui_,map_,un->second);
-	}
-}
-
-void turn_info::attack_resistance()
-{
-	const unit_map::const_iterator un = current_unit();
-	if(un != units_.end()) {
-		dialogs::show_unit_resistance(gui_,un->second);
-	}
-
-}
-
 void turn_info::unit_description()
 {
 	const unit_map::const_iterator un = current_unit();
--- a/src/playturn.hpp
+++ b/src/playturn.hpp
@ -129,8 +129,6 @@ private:
 	virtual void end_unit_turn();
 	virtual void undo();
 	virtual void redo();
-	virtual void terrain_table();
-	virtual void attack_resistance();
 	virtual void unit_description();
 	virtual void rename_unit();
 	virtual void save_game();
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -73,6 +73,13 @@ wesnothd_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesystem.Po ./$(DEPDIR)/game.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game_config.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/input_stream.Po ./$(DEPDIR)/log.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/metrics.Po ./$(DEPDIR)/network.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/player.Po ./$(DEPDIR)/server.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/variable.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@ -225,8 +232,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -365,84 +370,96 @@ distclean-compile:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<

 .cpp.obj:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 config.o: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp

 config.obj: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`

 filesystem.o: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.o -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp

 filesystem.obj: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.obj -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`

 game_config.o: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.o -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp

 game_config.obj: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.obj -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`

 log.o: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.o -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp

 log.obj: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.obj -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`

 network.o: ../network.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.o -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.o `test -f '../network.cpp' || echo '$(srcdir)/'`../network.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../network.cpp' object='network.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/network.Po' tmpdepfile='$(DEPDIR)/network.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.o `test -f '../network.cpp' || echo '$(srcdir)/'`../network.cpp

 network.obj: ../network.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.obj -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.obj `if test -f '../network.cpp'; then $(CYGPATH_W) '../network.cpp'; else $(CYGPATH_W) '$(srcdir)/../network.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../network.cpp' object='network.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/network.Po' tmpdepfile='$(DEPDIR)/network.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.obj `if test -f '../network.cpp'; then $(CYGPATH_W) '../network.cpp'; else $(CYGPATH_W) '$(srcdir)/../network.cpp'; fi`
 uninstall-info-am:

@ -466,11 +483,9 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -547,7 +562,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -108,6 +108,16 @@ merge_translations_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po ./$(DEPDIR)/cutter.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/dummy_video.Po ./$(DEPDIR)/exploder.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/exploder_composer.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/exploder_cutter.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/exploder_utils.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesystem.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game_config.Po ./$(DEPDIR)/log.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/make_translation.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/merge_translations.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/sdl_utils.Po ./$(DEPDIR)/variable.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@ -262,8 +272,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -457,98 +465,112 @@ distclean-compile:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<

 .cpp.obj:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 variable.o: ../server/variable.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT variable.o -MD -MP -MF "$(DEPDIR)/variable.Tpo" -c -o variable.o `test -f '../server/variable.cpp' || echo '$(srcdir)/'`../server/variable.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/variable.Tpo" "$(DEPDIR)/variable.Po"; else rm -f "$(DEPDIR)/variable.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../server/variable.cpp' object='variable.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/variable.Po' tmpdepfile='$(DEPDIR)/variable.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o variable.o `test -f '../server/variable.cpp' || echo '$(srcdir)/'`../server/variable.cpp

 variable.obj: ../server/variable.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT variable.obj -MD -MP -MF "$(DEPDIR)/variable.Tpo" -c -o variable.obj `if test -f '../server/variable.cpp'; then $(CYGPATH_W) '../server/variable.cpp'; else $(CYGPATH_W) '$(srcdir)/../server/variable.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/variable.Tpo" "$(DEPDIR)/variable.Po"; else rm -f "$(DEPDIR)/variable.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../server/variable.cpp' object='variable.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/variable.Po' tmpdepfile='$(DEPDIR)/variable.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o variable.obj `if test -f '../server/variable.cpp'; then $(CYGPATH_W) '../server/variable.cpp'; else $(CYGPATH_W) '$(srcdir)/../server/variable.cpp'; fi`

 config.o: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp

 config.obj: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`

 filesystem.o: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.o -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp

 filesystem.obj: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.obj -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`

 game_config.o: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.o -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp

 game_config.obj: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.obj -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`

 sdl_utils.o: ../sdl_utils.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sdl_utils.o -MD -MP -MF "$(DEPDIR)/sdl_utils.Tpo" -c -o sdl_utils.o `test -f '../sdl_utils.cpp' || echo '$(srcdir)/'`../sdl_utils.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sdl_utils.Tpo" "$(DEPDIR)/sdl_utils.Po"; else rm -f "$(DEPDIR)/sdl_utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../sdl_utils.cpp' object='sdl_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/sdl_utils.Po' tmpdepfile='$(DEPDIR)/sdl_utils.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sdl_utils.o `test -f '../sdl_utils.cpp' || echo '$(srcdir)/'`../sdl_utils.cpp

 sdl_utils.obj: ../sdl_utils.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sdl_utils.obj -MD -MP -MF "$(DEPDIR)/sdl_utils.Tpo" -c -o sdl_utils.obj `if test -f '../sdl_utils.cpp'; then $(CYGPATH_W) '../sdl_utils.cpp'; else $(CYGPATH_W) '$(srcdir)/../sdl_utils.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sdl_utils.Tpo" "$(DEPDIR)/sdl_utils.Po"; else rm -f "$(DEPDIR)/sdl_utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../sdl_utils.cpp' object='sdl_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/sdl_utils.Po' tmpdepfile='$(DEPDIR)/sdl_utils.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sdl_utils.obj `if test -f '../sdl_utils.cpp'; then $(CYGPATH_W) '../sdl_utils.cpp'; else $(CYGPATH_W) '$(srcdir)/../sdl_utils.cpp'; fi`

 log.o: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.o -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp

 log.obj: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.obj -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`
 uninstall-info-am:

@ -572,11 +594,9 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -653,7 +673,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- a/src/zip/Makefile.in
+++ b/src/zip/Makefile.in
@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -72,6 +72,11 @@ wesnoth_zip_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesystem.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game_config.Po ./$(DEPDIR)/log.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/network.Po ./$(DEPDIR)/variable.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/zip.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@ -224,8 +229,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@ -352,98 +355,112 @@ distclean-compile:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<

 .cpp.obj:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 config.o: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp

 config.obj: ../config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../config.cpp' object='config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/config.Po' tmpdepfile='$(DEPDIR)/config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.obj `if test -f '../config.cpp'; then $(CYGPATH_W) '../config.cpp'; else $(CYGPATH_W) '$(srcdir)/../config.cpp'; fi`

 filesystem.o: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.o -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.o `test -f '../filesystem.cpp' || echo '$(srcdir)/'`../filesystem.cpp

 filesystem.obj: ../filesystem.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filesystem.obj -MD -MP -MF "$(DEPDIR)/filesystem.Tpo" -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filesystem.Tpo" "$(DEPDIR)/filesystem.Po"; else rm -f "$(DEPDIR)/filesystem.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../filesystem.cpp' object='filesystem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/filesystem.Po' tmpdepfile='$(DEPDIR)/filesystem.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filesystem.obj `if test -f '../filesystem.cpp'; then $(CYGPATH_W) '../filesystem.cpp'; else $(CYGPATH_W) '$(srcdir)/../filesystem.cpp'; fi`

 game_config.o: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.o -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.o `test -f '../game_config.cpp' || echo '$(srcdir)/'`../game_config.cpp

 game_config.obj: ../game_config.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_config.obj -MD -MP -MF "$(DEPDIR)/game_config.Tpo" -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/game_config.Tpo" "$(DEPDIR)/game_config.Po"; else rm -f "$(DEPDIR)/game_config.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../game_config.cpp' object='game_config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/game_config.Po' tmpdepfile='$(DEPDIR)/game_config.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o game_config.obj `if test -f '../game_config.cpp'; then $(CYGPATH_W) '../game_config.cpp'; else $(CYGPATH_W) '$(srcdir)/../game_config.cpp'; fi`

 log.o: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.o -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.o `test -f '../log.cpp' || echo '$(srcdir)/'`../log.cpp

 log.obj: ../log.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log.obj -MD -MP -MF "$(DEPDIR)/log.Tpo" -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/log.Tpo" "$(DEPDIR)/log.Po"; else rm -f "$(DEPDIR)/log.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../log.cpp' object='log.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/log.Po' tmpdepfile='$(DEPDIR)/log.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o log.obj `if test -f '../log.cpp'; then $(CYGPATH_W) '../log.cpp'; else $(CYGPATH_W) '$(srcdir)/../log.cpp'; fi`

 network.o: ../network.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.o -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.o `test -f '../network.cpp' || echo '$(srcdir)/'`../network.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../network.cpp' object='network.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/network.Po' tmpdepfile='$(DEPDIR)/network.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.o `test -f '../network.cpp' || echo '$(srcdir)/'`../network.cpp

 network.obj: ../network.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network.obj -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.obj `if test -f '../network.cpp'; then $(CYGPATH_W) '../network.cpp'; else $(CYGPATH_W) '$(srcdir)/../network.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../network.cpp' object='network.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/network.Po' tmpdepfile='$(DEPDIR)/network.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network.obj `if test -f '../network.cpp'; then $(CYGPATH_W) '../network.cpp'; else $(CYGPATH_W) '$(srcdir)/../network.cpp'; fi`

 variable.o: ../server/variable.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT variable.o -MD -MP -MF "$(DEPDIR)/variable.Tpo" -c -o variable.o `test -f '../server/variable.cpp' || echo '$(srcdir)/'`../server/variable.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/variable.Tpo" "$(DEPDIR)/variable.Po"; else rm -f "$(DEPDIR)/variable.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../server/variable.cpp' object='variable.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/variable.Po' tmpdepfile='$(DEPDIR)/variable.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o variable.o `test -f '../server/variable.cpp' || echo '$(srcdir)/'`../server/variable.cpp

 variable.obj: ../server/variable.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT variable.obj -MD -MP -MF "$(DEPDIR)/variable.Tpo" -c -o variable.obj `if test -f '../server/variable.cpp'; then $(CYGPATH_W) '../server/variable.cpp'; else $(CYGPATH_W) '$(srcdir)/../server/variable.cpp'; fi`; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/variable.Tpo" "$(DEPDIR)/variable.Po"; else rm -f "$(DEPDIR)/variable.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../server/variable.cpp' object='variable.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/variable.Po' tmpdepfile='$(DEPDIR)/variable.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o variable.obj `if test -f '../server/variable.cpp'; then $(CYGPATH_W) '../server/variable.cpp'; else $(CYGPATH_W) '$(srcdir)/../server/variable.cpp'; fi`
 uninstall-info-am:

@ -467,11 +484,9 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -548,7 +563,7 @@ mostlyclean-generic:
 clean-generic:

 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"