[Freecivds-commit] SF.net SVN: freecivds: [2] freeciv-2.1.0-beta4-B1
Status: Alpha
Brought to you by:
danleslie
Menu
▾
▴
[Freecivds-commit] SF.net SVN: freecivds: [2] freeciv-2.1.0-beta4-B1
|
From: <dan...@us...> - 2007-06-03 05:16:25
|
Revision: 2
http://freecivds.svn.sourceforge.net/freecivds/?rev=2&view=rev
Author: danleslie
Date: 2007-06-02 22:16:25 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Added a method to build civclient.ds.gba
Modified Paths:
--------------
freeciv-2.1.0-beta4-B1/Makefile
freeciv-2.1.0-beta4-B1/README-NDS
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-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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -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/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
Modified: freeciv-2.1.0-beta4-B1/README-NDS
===================================================================
--- freeciv-2.1.0-beta4-B1/README-NDS 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/README-NDS 2007-06-03 05:16:25 UTC (rev 2)
@@ -2,7 +2,7 @@
To configure properly for the NDS the following command is suggested:
-./configure --enable-ds=yes --host=arm-eabi --disable-nls --disable-esd --with-libiconv-prefix=/home/dleslie/devkitARM
+./configure --enable-ds=yes --host=arm-eabi --disable-nls --disable-esd --without-x --with-libiconv-prefix=/home/dleslie/devkitARM
You may need to run autogen.sh first. You can supply the above parameters to achieve the same results.
Modified: freeciv-2.1.0-beta4-B1/ai/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/ai/Makefile 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/ai/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -71,16 +71,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -118,16 +118,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/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
CATALOGS =
@@ -232,7 +232,7 @@
MAINTAINER_MODE_FALSE =
MAINTAINER_MODE_TRUE = #
MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
MAKE_CLIENT_INCLUDE_FALSE =
MAKE_CLIENT_INCLUDE_TRUE = #
MAKE_DATA_FALSE = #
@@ -321,7 +321,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
@@ -914,6 +914,33 @@
uninstall uninstall-am uninstall-binPROGRAMS \
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 $@)
+%.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: %.elf
+ @$(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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/Makefile.am 2007-06-03 05:16:25 UTC (rev 2)
@@ -40,6 +40,31 @@
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 \
Modified: freeciv-2.1.0-beta4-B1/client/Makefile.in
===================================================================
--- freeciv-2.1.0-beta4-B1/client/Makefile.in 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/Makefile.in 2007-06-03 05:16:25 UTC (rev 2)
@@ -914,6 +914,33 @@
uninstall uninstall-am uninstall-binPROGRAMS \
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 $@)
+@DS_TRUE@%.nds: %.arm9
+@DS_TRUE@ @ndstool -c $@ -9 $<
+@DS_TRUE@ @echo built ... $(notdir $@)
+@DS_TRUE@ @genromfs -f $@.data -d ../data -x *.in -x *.am -x *svn* -x Makefile
+@DS_TRUE@ @padbin 0x100 $@
+@DS_TRUE@ @mv $@ $@.packed
+@DS_TRUE@ @cat $@.packed $@.data > $@
+
+@DS_TRUE@%.arm9: %.elf
+@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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/agents/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -66,16 +66,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-ds/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -74,16 +74,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
Modified: freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-ftwl/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -81,16 +81,16 @@
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-gtk-2.0/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -77,16 +77,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-sdl/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -84,16 +84,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-stub/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -74,16 +74,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-win32/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -75,16 +75,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/gui-xaw/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -76,16 +76,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/client/include/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -54,16 +54,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
Modified: freeciv-2.1.0-beta4-B1/common/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/common/Makefile 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/common/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -81,16 +81,16 @@
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
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/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/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/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
Modified: freeciv-2.1.0-beta4-B1/common/aicore/Makefile
===================================================================
--- freeciv-2.1.0-beta4-B1/common/aicore/Makefile 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/common/aicore/Makefile 2007-06-03 05:16:25 UTC (rev 2)
@@ -67,16 +67,16 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run aclocal-1.9
ALLOCA =
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run tar
+AMTAR = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run tar
AR = /home/dleslie/devkitARM/bin/arm-eabi-ar
AUTH_LIBS =
-AUTOCONF = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run automake-1.9
+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
AWK = mawk
BUILD_INCLUDED_LIBINTL = no
CATALOGS =
@@ -181,7 +181,7 @@
MAINTAINER_MODE_FALSE =
MAINTAINER_MODE_TRUE = #
MAJOR_VERSION = 2
-MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/missing --run makeinfo
MAKE_CLIENT_INCLUDE_FALSE =
MAKE_CLIENT_INCLUDE_TRUE = #
MAKE_DATA_FALSE = #
@@ -270,7 +270,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = /home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/bootstrap/install-sh
+install_sh = /home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/bootstrap/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
libggz_includes =
Modified: freeciv-2.1.0-beta4-B1/config.log
===================================================================
--- freeciv-2.1.0-beta4-B1/config.log 2007-05-08 01:30:06 UTC (rev 1)
+++ freeciv-2.1.0-beta4-B1/config.log 2007-06-03 05:16:25 UTC (rev 2)
@@ -4,17 +4,17 @@
It was created by configure, which was
generated by GNU Autoconf 2.61. Invocation command line was
- $ ./configure --enable-ds=yes --host=arm-eabi --disable-nls --disable-esd --with-libiconv-prefix=/home/dleslie/devkitARM
+ $ ./configure --enable-ds=yes --host=arm-eabi --disable-nls --disable-esd --with-libiconv-prefix=/home/dleslie/devkitARM --without-x
## --------- ##
## Platform. ##
## --------- ##
-hostname = durandal
+hostname = dalek
uname -m = i686
-uname -r = 2.6.20-15-generic
+uname -r = 2.6.20-16-generic
uname -s = Linux
-uname -v = #2 SMP Sun Apr 15 07:36:31 UTC 2007
+uname -v = #2 SMP Wed May 23 01:46:23 UTC 2007
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -430,10 +430,10 @@
configure:6718: result: uname
configure:6742: checking for iconv
configure:6774: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm >&5
-/tmp/ccEGeaRq.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:34: undefined reference to `libiconv_open'
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:35: undefined reference to `libiconv'
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:36: undefined reference to `libiconv_close'
+/tmp/cckDOh73.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:34: undefined reference to `libiconv_open'
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:35: undefined reference to `libiconv'
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:36: undefined reference to `libiconv_close'
collect2: ld returned 1 exit status
configure:6780: $? = 1
configure: failed program was:
@@ -634,8 +634,8 @@
configure:7817: result: yes
configure:7950: checking for getpagesize
configure:8006: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/cco0l29a.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:71: undefined reference to `getpagesize'
+/tmp/cca0Zc0g.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:71: undefined reference to `getpagesize'
collect2: ld returned 1 exit status
configure:8012: $? = 1
configure: failed program was:
@@ -914,8 +914,8 @@
configure:8402: result: yes
configure:8441: checking for feof_unlocked
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/cccYfilY.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:80: undefined reference to `feof_unlocked'
+/tmp/ccSGoFsr.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:80: undefined reference to `feof_unlocked'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1005,8 +1005,8 @@
configure:8521: result: no
configure:8441: checking for fgets_unlocked
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccmAaXsa.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:80: undefined reference to `fgets_unlocked'
+/tmp/ccsRf5pr.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:80: undefined reference to `fgets_unlocked'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1100,8 +1100,8 @@
configure:8521: result: yes
configure:8441: checking for getegid
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccyGjzIq.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:81: undefined reference to `getegid'
+/tmp/cc6rfeDj.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:81: undefined reference to `getegid'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1192,8 +1192,8 @@
configure:8521: result: no
configure:8441: checking for geteuid
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccc2rVsD.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:81: undefined reference to `geteuid'
+/tmp/ccw8WcOD.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:81: undefined reference to `geteuid'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1284,8 +1284,8 @@
configure:8521: result: no
configure:8441: checking for getgid
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccSMqOVP.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:81: undefined reference to `getgid'
+/tmp/ccOiM9hX.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:81: undefined reference to `getgid'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1376,8 +1376,8 @@
configure:8521: result: no
configure:8441: checking for getuid
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccy9o5FZ.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:81: undefined reference to `getuid'
+/tmp/ccuz4dAm.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:81: undefined reference to `getuid'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1473,8 +1473,8 @@
configure:8521: result: yes
configure:8441: checking for munmap
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccgjEG2f.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:82: undefined reference to `munmap'
+/tmp/cco1z8IR.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:82: undefined reference to `munmap'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1579,8 +1579,8 @@
configure:8441: checking for stpcpy
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
conftest.c:74: warning: conflicting types for built-in function 'stpcpy'
-/tmp/ccoALgiJ.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:85: undefined reference to `stpcpy'
+/tmp/ccCCr8tq.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:85: undefined reference to `stpcpy'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1698,8 +1698,8 @@
configure:8521: result: yes
configure:8441: checking for __argz_count
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccEgCncJ.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:90: undefined reference to `__argz_count'
+/tmp/ccHDCiSk.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:90: undefined reference to `__argz_count'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1799,8 +1799,8 @@
configure:8521: result: no
configure:8441: checking for __argz_stringify
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccAZAvtW.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:90: undefined reference to `__argz_stringify'
+/tmp/ccqBRIRv.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:90: undefined reference to `__argz_stringify'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -1900,8 +1900,8 @@
configure:8521: result: no
configure:8441: checking for __argz_next
configure:8497: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -I/home/dleslie/devkitARM/include -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-/tmp/ccUcPNk8.o: In function `main':
-/home/dleslie/Documents/Workspace/freeciv-2.1.0-beta4-test/conftest.c:90: undefined reference to `__argz_next'
+/tmp/ccmqIGKW.o: In function `main':
+/home/dleslie/Documents/Workspace/freecivds/freeciv-2.1.0-beta4-B2/conftest.c:90: undefined reference to `__argz_next'
collect2: ld returned 1 exit status
configure:8503: $? = 1
configure: failed program was:
@@ -2055,148 +2055,7 @@
configure:10989: found /bin/gzip
configure:11002: result: /bin/gzip
configure:12619: checking for X
-configure:12734: /home/dleslie/devkitARM/bin/arm-eabi-cpp -specs=ds_arm9.specs -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -DLOCALEDIR="\"${datarootdir}/locale\"" conftest.c
-conftest.c:62:22: error: X11/Xlib.h: No such file or directory
-configure:12740: $? = 1
-configure: failed program was:
-| /* confdefs.h. */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define FC_CONFIG_H 1
-| #define MAJOR_VERSION 2
-| #define MINOR_VERSION 1
-| #define PATCH_VERSION 0
-| #define VERSION_LABEL "-beta4"
-| #define VERSION_STRING "2.1.0-beta4"
-| #define IS_DEVEL_VERSION 0
-| #define IS_BETA_VERSION 1
-| #define NEXT_STABLE_VERSION "2.1.0"
-| #define RELEASE_MONTH 4
-| #define NETWORK_CAPSTRING "+2.1c, CitywallFix"
-| #define PACKAGE "freeciv"
-| #define VERSION "2.1.0-beta4"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ICONV 1
-| #define ICONV_CONST const
-| #define HAVE_LIBCHARSET 1
-| #define HAVE_LANGINFO_CODESET 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_ALLOCA 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARGZ_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_LOCALE_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_SYS_PARAM_H 1
-| #define HAVE_GETCWD 1
-| #define HAVE_MEMPCPY 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_SETLOCALE 1
-| #define HAVE_STRCHR 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRTOUL 1
-| #define HAVE_TSEARCH 1
-| #define HAVE_ICONV 1
-| #define ICONV_CONST const
-| #define HAVE_LANGINFO_CODESET 1
-| #define HAVE_LC_MESSAGES 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_LIBZ 1
-| /* end confdefs.h. */
-| #include <X11/Xlib.h>
-configure:12789: /home/dleslie/devkitARM/bin/arm-eabi-gcc -specs=ds_arm9.specs -o conftest -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -g -O2 -DARM9 -DNDS -DKOSFS -Wall -O2 -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -ffast-math -I/home/dleslie/devkitARM/include -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -DLOCALEDIR="\"${datarootdir}/locale\"" -g -mthumb-interwork -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib -L/home/dleslie/devkitARM/lib conftest.c -lX11 -lz -lnds9 -lSDL -lKOSfs -ldswifi9 -lm -liconv >&5
-conftest.c:62:22: error: X11/Xlib.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:66: warning: implicit declaration of function 'XrmInitialize'
-configure:12795: $? = 1
-configure: failed program was:
-| /* confdefs.h. */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define FC_CONFIG_H 1
-| #define MAJOR_VERSION 2
-| #define MINOR_VERSION 1
-| #define PATCH_VERSION 0
-| #define VERSION_LABEL "-beta4"
-| #define VERSION_STRING "2.1.0-beta4"
-| #define IS_DEVEL_VERSION 0
-| #define IS_BETA_VERSION 1
-| #define NEXT_STABLE_VERSION "2.1.0"
-| #define RELEASE_MONTH 4
-| #define NETWORK_CAPSTRING "+2.1c, CitywallFix"
-| #define PACKAGE "freeciv"
-| #define VERSION "2.1.0-beta4"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ICONV 1
-| #define ICONV_CONST const
-| #define HAVE_LIBCHARSET 1
-| #define HAVE_LANGINFO_CODESET 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_ALLOCA 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARGZ_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_LOCALE_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_SYS_PARAM_H 1
-| #define HAVE_GETCWD 1
-| #define HAVE_MEMPCPY 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_SETLOCALE 1
-| #define HAVE_STRCHR 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRTOUL 1
-| #define HAVE_TSEARCH 1
-| #define HAVE_ICONV 1
-| #define ICONV_CONST const
-| #define HAVE_LANGINFO_CODESET 1
-| #define HAVE_LC_MESSAGES 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_LIBZ 1
-| /* end confdefs.h. */
-| #include <X11/Xlib.h>
-| int
-| main ()
-| {
-| XrmInitialize ()
-| ;
-| return 0;
-| }
-configure:12854: result: l...
[truncated message content] |
