[Freecivds-commit] SF.net SVN: freecivds: [4] freeciv-2.1.0-beta4-B1

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4
          http://freecivds.svn.sourceforge.net/freecivds/?rev=4&view=rev
Author:   danleslie
Date:     2007-06-07 16:10:03 -0700 (Thu, 07 Jun 2007)

Log Message:
-----------
Fixed a build issue

Modified Paths:
--------------
    freeciv-2.1.0-beta4-B1/Makefile
    freeciv-2.1.0-beta4-B1/ai/Makefile
    freeciv-2.1.0-beta4-B1/client/Makefile
    freeciv-2.1.0-beta4-B1/client/Makefile.am
    freeciv-2.1.0-beta4-B1/client/Makefile.in
    freeciv-2.1.0-beta4-B1/client/agents/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-ds/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-ds/gui_main.c
    freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-gtk-2.0/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-sdl/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-stub/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-win32/Makefile
    freeciv-2.1.0-beta4-B1/client/gui-xaw/Makefile
    freeciv-2.1.0-beta4-B1/client/include/Makefile
    freeciv-2.1.0-beta4-B1/common/Makefile
    freeciv-2.1.0-beta4-B1/common/aicore/Makefile
    freeciv-2.1.0-beta4-B1/config.log
    freeciv-2.1.0-beta4-B1/config.status
    freeciv-2.1.0-beta4-B1/data/Makefile
    freeciv-2.1.0-beta4-B1/data/amplio/Makefile
    freeciv-2.1.0-beta4-B1/data/buildings/Makefile
    freeciv-2.1.0-beta4-B1/data/civ1/Makefile
    freeciv-2.1.0-beta4-B1/data/civ2/Makefile
    freeciv-2.1.0-beta4-B1/data/default/Makefile
    freeciv-2.1.0-beta4-B1/data/flags/Makefile
    freeciv-2.1.0-beta4-B1/data/hex2t/Makefile
    freeciv-2.1.0-beta4-B1/data/isophex/Makefile
    freeciv-2.1.0-beta4-B1/data/isotrident/Makefile
    freeciv-2.1.0-beta4-B1/data/misc/Makefile
    freeciv-2.1.0-beta4-B1/data/nation/Makefile
    freeciv-2.1.0-beta4-B1/data/scenario/Makefile
    freeciv-2.1.0-beta4-B1/data/stdsounds/Makefile
    freeciv-2.1.0-beta4-B1/data/themes/Makefile
    freeciv-2.1.0-beta4-B1/data/themes/gui-sdl/Makefile
    freeciv-2.1.0-beta4-B1/data/themes/gui-sdl/human/Makefile
    freeciv-2.1.0-beta4-B1/data/trident/Makefile
    freeciv-2.1.0-beta4-B1/data/wonders/Makefile
    freeciv-2.1.0-beta4-B1/dependencies/Makefile
    freeciv-2.1.0-beta4-B1/dependencies/lua/Makefile
    freeciv-2.1.0-beta4-B1/dependencies/lua/src/Makefile
    freeciv-2.1.0-beta4-B1/dependencies/lua/src/lib/Makefile
    freeciv-2.1.0-beta4-B1/dependencies/tolua/Makefile
    freeciv-2.1.0-beta4-B1/doc/Makefile
    freeciv-2.1.0-beta4-B1/doc/de/Makefile
    freeciv-2.1.0-beta4-B1/doc/fr/Makefile
    freeciv-2.1.0-beta4-B1/doc/it/Makefile
    freeciv-2.1.0-beta4-B1/doc/ja/Makefile
    freeciv-2.1.0-beta4-B1/doc/man/Makefile
    freeciv-2.1.0-beta4-B1/doc/nl/Makefile
    freeciv-2.1.0-beta4-B1/doc/sv/Makefile
    freeciv-2.1.0-beta4-B1/ds/Makefile
    freeciv-2.1.0-beta4-B1/manual/Makefile
    freeciv-2.1.0-beta4-B1/server/Makefile
    freeciv-2.1.0-beta4-B1/server/generator/Makefile
    freeciv-2.1.0-beta4-B1/server/scripting/Makefile
    freeciv-2.1.0-beta4-B1/tests/Makefile
    freeciv-2.1.0-beta4-B1/utility/Makefile
    freeciv-2.1.0-beta4-B1/utility/ftwl/Makefile
    freeciv-2.1.0-beta4-B1/win32/Makefile

Modified: freeciv-2.1.0-beta4-B1/Makefile
===================================================================

--- freeciv-2.1.0-beta4-B1/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -83,16 +83,16 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -197,7 +197,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -286,7 +286,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/ai/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/ai/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/ai/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -71,16 +71,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -185,7 +185,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -274,7 +274,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -14,7 +14,6 @@
 
 
 
-
 srcdir = .
 top_srcdir = ..
 
@@ -38,7 +37,6 @@
 build_triplet = i686-pc-linux-gnulibc1
 host_triplet = arm-unknown-eabi
 target_triplet = arm-unknown-eabi
-bin_PROGRAMS = civclient$(EXEEXT)
 subdir = client
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/bootstrap/freeciv.desktop.in
@@ -50,55 +48,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = freeciv.desktop
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__civclient_SOURCES_DIST = audio_sdl.c audio_sdl.h attribute.h \
-	attribute.c citydlg_common.c citydlg_common.h cityrepdata.c \
-	cityrepdata.h civclient.c civclient.h chatline_common.c \
-	chatline_common.h connectdlg_common.c connectdlg_common.h \
-	climisc.c climisc.h climap.c climap.h clinet.c clinet.h \
-	colors_common.c colors_common.h control.c control.h \
-	ggzclient.c ggzclient.h goto.c goto.h helpdata.c helpdata.h \
-	mapctrl_common.c mapctrl_common.h mapview_common.c \
-	mapview_common.h messagewin_common.c messagewin_common.h \
-	overview_common.c overview_common.h packhand.c packhand.h \
-	packhand_gen.h packhand_gen.c plrdlg_common.c plrdlg_common.h \
-	options.c options.h repodlgs_common.c repodlgs_common.h \
-	reqtree.c reqtree.h servers.c servers.h text.c text.h \
-	themes_common.c themes_common.h tilespec.c tilespec.h audio.c \
-	audio.h audio_none.c audio_none.h
-am__objects_1 = audio_sdl.$(OBJEXT)
-#am__objects_2 = $(am__objects_1)
-am_civclient_OBJECTS = $(am__objects_2) attribute.$(OBJEXT) \
-	citydlg_common.$(OBJEXT) cityrepdata.$(OBJEXT) \
-	civclient.$(OBJEXT) chatline_common.$(OBJEXT) \
-	connectdlg_common.$(OBJEXT) climisc.$(OBJEXT) climap.$(OBJEXT) \
-	clinet.$(OBJEXT) colors_common.$(OBJEXT) control.$(OBJEXT) \
-	ggzclient.$(OBJEXT) goto.$(OBJEXT) helpdata.$(OBJEXT) \
-	mapctrl_common.$(OBJEXT) mapview_common.$(OBJEXT) \
-	messagewin_common.$(OBJEXT) overview_common.$(OBJEXT) \
-	packhand.$(OBJEXT) packhand_gen.$(OBJEXT) \
-	plrdlg_common.$(OBJEXT) options.$(OBJEXT) \
-	repodlgs_common.$(OBJEXT) reqtree.$(OBJEXT) servers.$(OBJEXT) \
-	text.$(OBJEXT) themes_common.$(OBJEXT) tilespec.$(OBJEXT) \
-	audio.$(OBJEXT) audio_none.$(OBJEXT)
-civclient_OBJECTS = $(am_civclient_OBJECTS)
-#am__DEPENDENCIES_1 = ../utility/ftwl/libftwl.a
-am__DEPENDENCIES_2 = ../utility/libcivutility.a $(am__DEPENDENCIES_1) \
-	../common/libcivcommon.a ../common/aicore/libaicore.a \
-	agents/libagents.a $(gui_sources)/libguiclient.a ../ds/libds.a
-am__DEPENDENCIES_3 =
-#am__DEPENDENCIES_4 = ../win32/clienticon.o
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(civclient_SOURCES)
-DIST_SOURCES = $(am__civclient_SOURCES_DIST)
+SOURCES =
+DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -111,6 +62,7 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(desktopfiledir)"
 desktopfileDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(desktopfile_DATA)
 ETAGS = etags
@@ -118,16 +70,16 @@
 DIST_SUBDIRS = gui-ds gui-ftwl gui-gtk-2.0 gui-sdl gui-stub gui-win32 \
 	gui-xaw include agents
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -232,7 +184,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -321,7 +273,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 
@@ -508,10 +460,13 @@
 desktopfile_DATA = \
 	freeciv.desktop
 
+
+#include $(DEVKITARM)/base_rules
+#	 from ds_rules in devkitarm, modified
+OBJCOPY = arm-eabi-objcopy
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
 $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -543,84 +498,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 freeciv.desktop: $(top_builddir)/config.status $(top_srcdir)/bootstrap/freeciv.desktop.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-civclient$(EXEEXT): $(civclient_OBJECTS) $(civclient_DEPENDENCIES) 
-	@rm -f civclient$(EXEEXT)
-	$(LINK) $(civclient_LDFLAGS) $(civclient_OBJECTS) $(civclient_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/attribute.Po
-include ./$(DEPDIR)/audio.Po
-include ./$(DEPDIR)/audio_none.Po
-include ./$(DEPDIR)/audio_sdl.Po
-include ./$(DEPDIR)/chatline_common.Po
-include ./$(DEPDIR)/citydlg_common.Po
-include ./$(DEPDIR)/cityrepdata.Po
-include ./$(DEPDIR)/civclient.Po
-include ./$(DEPDIR)/climap.Po
-include ./$(DEPDIR)/climisc.Po
-include ./$(DEPDIR)/clinet.Po
-include ./$(DEPDIR)/colors_common.Po
-include ./$(DEPDIR)/connectdlg_common.Po
-include ./$(DEPDIR)/control.Po
-include ./$(DEPDIR)/ggzclient.Po
-include ./$(DEPDIR)/goto.Po
-include ./$(DEPDIR)/helpdata.Po
-include ./$(DEPDIR)/mapctrl_common.Po
-include ./$(DEPDIR)/mapview_common.Po
-include ./$(DEPDIR)/messagewin_common.Po
-include ./$(DEPDIR)/options.Po
-include ./$(DEPDIR)/overview_common.Po
-include ./$(DEPDIR)/packhand.Po
-include ./$(DEPDIR)/packhand_gen.Po
-include ./$(DEPDIR)/plrdlg_common.Po
-include ./$(DEPDIR)/repodlgs_common.Po
-include ./$(DEPDIR)/reqtree.Po
-include ./$(DEPDIR)/servers.Po
-include ./$(DEPDIR)/text.Po
-include ./$(DEPDIR)/themes_common.Po
-include ./$(DEPDIR)/tilespec.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 install-desktopfileDATA: $(desktopfile_DATA)
 	@$(NORMAL_INSTALL)
@@ -817,10 +694,10 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"; do \
+	for dir in "$(DESTDIR)$(desktopfiledir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -849,13 +726,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -869,7 +744,7 @@
 
 install-data-am: install-desktopfileDATA
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-info: install-info-recursive
 
@@ -878,13 +753,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -894,36 +768,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA \
-	uninstall-info-am
+uninstall-am: uninstall-desktopfileDATA uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-desktopfileDATA \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am \
+	install-desktopfileDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-desktopfileDATA uninstall-info-am
+	uninstall uninstall-am uninstall-desktopfileDATA \
+	uninstall-info-am
 
-
-#include $(DEVKITARM)/ds_rules
-include $(DEVKITARM)/base_rules
-
-#%.img:	%.nds
-#	genromfs -f $@ -d ../data -v -x *.in -x *.am -x *svn*
-#	padbin 0x100 $<
-#	cat $<.nds $@ > $<
-
-# from ds_rules in devkitarm, modified
 %.ds.gba: %.nds
 	@dsbuild $<
 	@echo built ... $(notdir $@)
@@ -934,13 +796,9 @@
 	@padbin 0x100 $@
 	@mv $@ $@.packed
 	@cat $@.packed $@.data > $@
-
-%.arm9: %.elf
+%.arm9: %
 	@$(OBJCOPY) -O binary $< $@
 	@echo built ... $(notdir $@)
-#Override the ds_rules for %.elf
-%.elf: %
-	cp $< $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: freeciv-2.1.0-beta4-B1/client/Makefile.am
===================================================================
--- freeciv-2.1.0-beta4-B1/client/Makefile.am	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/Makefile.am	2007-06-07 23:10:03 UTC (rev 4)
@@ -40,31 +40,6 @@
 CLIENTICON=../win32/clienticon.o
 endif
 
-if DS
-include $(DEVKITARM)/base_rules
-
-# from ds_rules in devkitarm, modified
-%.ds.gba: %.nds
-	@dsbuild $<
-	@echo built ... $(notdir $@)
-%.nds: %.arm9
-	@ndstool -c $@ -9 $<
-	@echo built ... $(notdir $@)
-	@genromfs -f $@.data -d ../data -x *.in -x *.am -x *svn* -x Makefile
-	@padbin 0x100 $@
-	@mv $@ $@.packed
-	@cat $@.packed $@.data > $@
-
-%.arm9: %
-	@$(OBJCOPY) -O binary $< $@
-	@echo built ... $(notdir $@)
-#Override the ds_rules for %.elf
-#%.elf: %
-#	@cp $< $@
-
-endif
-
-
 EXTRA_DIST= 	gui-mui/autogroupclass.c         \
 		gui-mui/autogroupclass.h         \
 		gui-mui/chatline.c               \
@@ -148,8 +123,6 @@
 
 SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE) agents
 
-bin_PROGRAMS = civclient
-
 AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl -I$(srcdir)/agents $(SOUND_CFLAGS) $(LIBGGZ_INCLUDES) $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) -I$(top_srcdir)/ds
 
 ## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
@@ -230,3 +203,24 @@
 desktopfiledir = $(prefix)/share/applications
 desktopfile_DATA = \
 	freeciv.desktop
+
+if DS
+#include $(DEVKITARM)/base_rules
+#	 from ds_rules in devkitarm, modified
+OBJCOPY = arm-eabi-objcopy
+%.ds.gba: %.nds
+	@dsbuild $<
+	@echo built ... $(notdir $@)
+%.nds: %.arm9
+	@ndstool -c $@ -9 $<
+	@echo built ... $(notdir $@)
+	@echo constructing romfs ...
+	@genromfs -f $@.data -d ../data -x *.in -x *.am -x *svn* -x Makefile
+	@padbin 0x100 $@
+	@mv $@ $@.packed
+	@cat $@.packed $@.data > $@
+	@echo done
+%.arm9: %
+	@$(OBJCOPY) -O binary $< $@
+	@echo built ... $(notdir $@)
+endif

Modified: freeciv-2.1.0-beta4-B1/client/Makefile.in
===================================================================
--- freeciv-2.1.0-beta4-B1/client/Makefile.in	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/Makefile.in	2007-06-07 23:10:03 UTC (rev 4)
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -38,7 +37,6 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-bin_PROGRAMS = civclient$(EXEEXT)
 subdir = client
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/bootstrap/freeciv.desktop.in
@@ -50,55 +48,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = freeciv.desktop
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__civclient_SOURCES_DIST = audio_sdl.c audio_sdl.h attribute.h \
-	attribute.c citydlg_common.c citydlg_common.h cityrepdata.c \
-	cityrepdata.h civclient.c civclient.h chatline_common.c \
-	chatline_common.h connectdlg_common.c connectdlg_common.h \
-	climisc.c climisc.h climap.c climap.h clinet.c clinet.h \
-	colors_common.c colors_common.h control.c control.h \
-	ggzclient.c ggzclient.h goto.c goto.h helpdata.c helpdata.h \
-	mapctrl_common.c mapctrl_common.h mapview_common.c \
-	mapview_common.h messagewin_common.c messagewin_common.h \
-	overview_common.c overview_common.h packhand.c packhand.h \
-	packhand_gen.h packhand_gen.c plrdlg_common.c plrdlg_common.h \
-	options.c options.h repodlgs_common.c repodlgs_common.h \
-	reqtree.c reqtree.h servers.c servers.h text.c text.h \
-	themes_common.c themes_common.h tilespec.c tilespec.h audio.c \
-	audio.h audio_none.c audio_none.h
-am__objects_1 = audio_sdl.$(OBJEXT)
-@SDL_TRUE@am__objects_2 = $(am__objects_1)
-am_civclient_OBJECTS = $(am__objects_2) attribute.$(OBJEXT) \
-	citydlg_common.$(OBJEXT) cityrepdata.$(OBJEXT) \
-	civclient.$(OBJEXT) chatline_common.$(OBJEXT) \
-	connectdlg_common.$(OBJEXT) climisc.$(OBJEXT) climap.$(OBJEXT) \
-	clinet.$(OBJEXT) colors_common.$(OBJEXT) control.$(OBJEXT) \
-	ggzclient.$(OBJEXT) goto.$(OBJEXT) helpdata.$(OBJEXT) \
-	mapctrl_common.$(OBJEXT) mapview_common.$(OBJEXT) \
-	messagewin_common.$(OBJEXT) overview_common.$(OBJEXT) \
-	packhand.$(OBJEXT) packhand_gen.$(OBJEXT) \
-	plrdlg_common.$(OBJEXT) options.$(OBJEXT) \
-	repodlgs_common.$(OBJEXT) reqtree.$(OBJEXT) servers.$(OBJEXT) \
-	text.$(OBJEXT) themes_common.$(OBJEXT) tilespec.$(OBJEXT) \
-	audio.$(OBJEXT) audio_none.$(OBJEXT)
-civclient_OBJECTS = $(am_civclient_OBJECTS)
-@CLIENT_GUI_FTWL_TRUE@am__DEPENDENCIES_1 = ../utility/ftwl/libftwl.a
-am__DEPENDENCIES_2 = ../utility/libcivutility.a $(am__DEPENDENCIES_1) \
-	../common/libcivcommon.a ../common/aicore/libaicore.a \
-	agents/libagents.a $(gui_sources)/libguiclient.a ../ds/libds.a
-am__DEPENDENCIES_3 =
-@MINGW32_TRUE@am__DEPENDENCIES_4 = ../win32/clienticon.o
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(civclient_SOURCES)
-DIST_SOURCES = $(am__civclient_SOURCES_DIST)
+SOURCES =
+DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -111,6 +62,7 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(desktopfiledir)"
 desktopfileDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(desktopfile_DATA)
 ETAGS = etags
@@ -508,10 +460,13 @@
 desktopfile_DATA = \
 	freeciv.desktop
 
+
+#include $(DEVKITARM)/base_rules
+#	 from ds_rules in devkitarm, modified
+@DS_TRUE@OBJCOPY = arm-eabi-objcopy
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -543,84 +498,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 freeciv.desktop: $(top_builddir)/config.status $(top_srcdir)/bootstrap/freeciv.desktop.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-civclient$(EXEEXT): $(civclient_OBJECTS) $(civclient_DEPENDENCIES) 
-	@rm -f civclient$(EXEEXT)
-	$(LINK) $(civclient_LDFLAGS) $(civclient_OBJECTS) $(civclient_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/attribute.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_none.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_sdl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatline_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/citydlg_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cityrepdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/civclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/climap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/climisc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clinet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colors_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connectdlg_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/control.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ggzclient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapctrl_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapview_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/messagewin_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/overview_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packhand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packhand_gen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plrdlg_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repodlgs_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reqtree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/servers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/themes_common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tilespec.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 install-desktopfileDATA: $(desktopfile_DATA)
 	@$(NORMAL_INSTALL)
@@ -817,10 +694,10 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"; do \
+	for dir in "$(DESTDIR)$(desktopfiledir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -849,13 +726,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -869,7 +744,7 @@
 
 install-data-am: install-desktopfileDATA
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-info: install-info-recursive
 
@@ -878,13 +753,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -894,36 +768,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA \
-	uninstall-info-am
+uninstall-am: uninstall-desktopfileDATA uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-desktopfileDATA \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am \
+	install-desktopfileDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-desktopfileDATA uninstall-info-am
+	uninstall uninstall-am uninstall-desktopfileDATA \
+	uninstall-info-am
 
-
-#include $(DEVKITARM)/ds_rules
-@DS_TRUE@include $(DEVKITARM)/base_rules
-
-#%.img:	%.nds
-#	genromfs -f $@ -d ../data -v -x *.in -x *.am -x *svn*
-#	padbin 0x100 $<
-#	cat $<.nds $@ > $<
-
-# from ds_rules in devkitarm, modified
 @DS_TRUE@%.ds.gba: %.nds
 @DS_TRUE@	@dsbuild $<
 @DS_TRUE@	@echo built ... $(notdir $@)
@@ -934,13 +796,9 @@
 @DS_TRUE@	@padbin 0x100 $@
 @DS_TRUE@	@mv $@ $@.packed
 @DS_TRUE@	@cat $@.packed $@.data > $@
-
-@DS_TRUE@%.arm9: %.elf
+@DS_TRUE@%.arm9: %
 @DS_TRUE@	@$(OBJCOPY) -O binary $< $@
 @DS_TRUE@	@echo built ... $(notdir $@)
-#Override the ds_rules for %.elf
-@DS_TRUE@%.elf: %
-@DS_TRUE@	cp $< $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: freeciv-2.1.0-beta4-B1/client/agents/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/agents/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/agents/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -66,16 +66,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -180,7 +180,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -269,7 +269,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-ds/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-ds/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-ds/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -74,16 +74,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -188,7 +188,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -277,7 +277,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-ds/gui_main.c
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-ds/gui_main.c	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-ds/gui_main.c	2007-06-07 23:10:03 UTC (rev 4)
@@ -43,7 +43,7 @@
 void set_city_names_font_sizes(int my_city_names_font_size,
 			       int my_city_productions_font_size)
 {
-  freelog(LOG_ERROR, "Unimplemented set_city_names_font_sizes.");
+//  freelog(LOG_ERROR, "Unimplemented set_city_names_font_sizes.");
   /* PORTME */
 }
 
@@ -62,7 +62,7 @@
 void ui_main(int argc, char *argv[])
 {
   /* PORTME */
-  fc_fprintf(stderr, "Freeciv rules!\n");
+//  fc_fprintf(stderr, "Freeciv rules!\n");
 }
 
 /**************************************************************************
@@ -167,6 +167,6 @@
   /* PORTME */
 
   /* This is a reasonable fallback if it's not ported. */
-  freelog(LOG_ERROR, "Unimplemented add_idle_callback.");
+ // freelog(LOG_ERROR, "Unimplemented add_idle_callback.");
   (callback)(data);
 }

Modified: freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -81,16 +81,16 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -195,7 +195,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -284,7 +284,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-gtk-2.0/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-gtk-2.0/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-gtk-2.0/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -77,16 +77,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -191,7 +191,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -280,7 +280,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-sdl/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-sdl/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-sdl/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -84,16 +84,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -198,7 +198,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -287,7 +287,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-stub/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-stub/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-stub/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -74,16 +74,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -188,7 +188,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -277,7 +277,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-win32/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-win32/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-win32/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -75,16 +75,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -189,7 +189,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -278,7 +278,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/gui-xaw/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-xaw/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/gui-xaw/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -76,16 +76,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -190,7 +190,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -279,7 +279,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/client/include/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/include/Makefile	2007-06-03 22:00:38 UTC (rev 3)
+++ freeciv-2.1.0-beta4-B1/client/include/Makefile	2007-06-07 23:10:03 UTC (rev 4)
@@ -54,16 +54,16 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run tar
 AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
 AUTH_LIBS = 
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run automake-1.9
 AWK = mawk
 BUILD_INCLUDED_LIBINTL = no
 CATALOGS = 
@@ -168,7 +168,7 @@
 MAINTAINER_MODE_FALSE = 
 MAINTAINER_MODE_TRUE = #
 MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/missing --run makeinfo
 MAKE_CLIENT_INCLUDE_FALSE = 
 MAKE_CLIENT_INCLUDE_TRUE = #
 MAKE_DATA_FALSE = #
@@ -257,7 +257,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B1/bootstrap/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 libggz_includes = 

Modified: freeciv-2.1.0-beta4-B1/common/Makefile
==============...
 
[truncated message content]