Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC...

Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.

Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC...
Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.
d1e156eb · coppro · ee21883c · d1e156eb · d1e156eb · d1e156eb
Commit d1e156eb authored Mar 15, 2007 by coppro
20 changed files
--- a/MakeAM
+++ b/MakeAM
+rm Makefile.am;
+echo "
+#+----------------------------------------------------------------------------+
+#| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+#| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
+#| License:      GNU General Public License 2 or later (see file COPYING)     |
+#+----------------------------------------------------------------------------+
+# This flag allows us to use subdirectories:
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = magicseteditor
+AM_CXXFLAGS = @WX_CXXFLAGS@ -DUNICODE -I . -Wall
+AM_LDFLAGS  = @WX_LIBS@
+magicseteditor_SOURCES = 
+# The script used to generate is MakeAM. " | cat > Makefile.am;
+find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" | cat >> Makefile.am;
\ No newline at end of file
--- a/Makefile
+++ b/Makefile
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20,8 +20,6 @@
 #| License:      GNU General Public License 2 or later (see file COPYING)     |
 #+----------------------------------------------------------------------------+
-SOURCES = $(magicseteditor_SOURCES)
 srcdir = .
 top_srcdir = .
@@ -44,10 +42,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = magicseteditor$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/src/config.h.in AUTHORS COPYING ChangeLog \
+	$(top_srcdir)/src/config.h.in COPYING TODO depcomp install-sh \
-	INSTALL NEWS TODO depcomp install-sh missing
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,113 +59,112 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
-am_magicseteditor_OBJECTS = ./src/gfx/color.$(OBJEXT) \
+am_magicseteditor_OBJECTS = ./src/render/text/viewer.$(OBJEXT) \
-	./src/gfx/bezier.$(OBJEXT) ./src/gfx/blend_image.$(OBJEXT) \
+	./src/render/text/compound.$(OBJEXT) \
+	./src/render/text/symbol.$(OBJEXT) \
+	./src/render/text/font.$(OBJEXT) \
+	./src/render/text/element.$(OBJEXT) \
+	./src/render/symbol/viewer.$(OBJEXT) \
+	./src/render/symbol/filter.$(OBJEXT) \
+	./src/render/card/viewer.$(OBJEXT) \
+	./src/render/value/color.$(OBJEXT) \
+	./src/render/value/viewer.$(OBJEXT) \
+	./src/render/value/image.$(OBJEXT) \
+	./src/render/value/text.$(OBJEXT) \
+	./src/render/value/symbol.$(OBJEXT) \
+	./src/render/value/multiple_choice.$(OBJEXT) \
+	./src/render/value/choice.$(OBJEXT) \
+	./src/gfx/rotate_image.$(OBJEXT) ./src/gfx/color.$(OBJEXT) \
+	./src/gfx/bezier.$(OBJEXT) ./src/gfx/combine_image.$(OBJEXT) \
+	./src/gfx/image_effects.$(OBJEXT) \
+	./src/gfx/polynomial.$(OBJEXT) ./src/gfx/blend_image.$(OBJEXT) \
 	./src/gfx/resample_image.$(OBJEXT) \
 	./src/gfx/resample_text.$(OBJEXT) \
-	./src/gfx/image_effects.$(OBJEXT) \
+	./src/gfx/mask_image.$(OBJEXT) \
-	./src/gfx/rotate_image.$(OBJEXT) \
-	./src/gfx/combine_image.$(OBJEXT) \
-	./src/gfx/polynomial.$(OBJEXT) ./src/gfx/mask_image.$(OBJEXT) \
-	./src/gui/set/stats_panel.$(OBJEXT) \
-	./src/gui/set/panel.$(OBJEXT) \
-	./src/gui/set/set_info_panel.$(OBJEXT) \
-	./src/gui/set/style_panel.$(OBJEXT) \
-	./src/gui/set/keywords_panel.$(OBJEXT) \
-	./src/gui/set/window.$(OBJEXT) \
-	./src/gui/set/cards_panel.$(OBJEXT) \
-	./src/gui/control/card_viewer.$(OBJEXT) \
-	./src/gui/control/filtered_card_list.$(OBJEXT) \
 	./src/gui/control/select_card_list.$(OBJEXT) \
-	./src/gui/control/package_list.$(OBJEXT) \
-	./src/gui/control/gallery_list.$(OBJEXT) \
 	./src/gui/control/graph.$(OBJEXT) \
 	./src/gui/control/image_card_list.$(OBJEXT) \
 	./src/gui/control/card_list.$(OBJEXT) \
-	./src/gui/control/card_list_column_select.$(OBJEXT) \
+	./src/gui/control/text_ctrl.$(OBJEXT) \
 	./src/gui/control/native_look_editor.$(OBJEXT) \
 	./src/gui/control/card_editor.$(OBJEXT) \
-	./src/gui/control/text_ctrl.$(OBJEXT) \
+	./src/gui/control/card_list_column_select.$(OBJEXT) \
-	./src/gui/preferences_window.$(OBJEXT) \
+	./src/gui/control/filtered_card_list.$(OBJEXT) \
-	./src/gui/drop_down_list.$(OBJEXT) \
+	./src/gui/control/package_list.$(OBJEXT) \
-	./src/gui/card_select_window.$(OBJEXT) \
+	./src/gui/control/gallery_list.$(OBJEXT) \
-	./src/gui/welcome_window.$(OBJEXT) \
+	./src/gui/control/card_viewer.$(OBJEXT) \
+	./src/gui/set/style_panel.$(OBJEXT) \
+	./src/gui/set/panel.$(OBJEXT) \
+	./src/gui/set/set_info_panel.$(OBJEXT) \
+	./src/gui/set/keywords_panel.$(OBJEXT) \
+	./src/gui/set/window.$(OBJEXT) \
+	./src/gui/set/cards_panel.$(OBJEXT) \
+	./src/gui/set/stats_panel.$(OBJEXT) \
+	./src/gui/symbol/select_editor.$(OBJEXT) \
+	./src/gui/symbol/point_editor.$(OBJEXT) \
+	./src/gui/symbol/control.$(OBJEXT) \
+	./src/gui/symbol/part_list.$(OBJEXT) \
+	./src/gui/symbol/editor.$(OBJEXT) \
+	./src/gui/symbol/basic_shape_editor.$(OBJEXT) \
+	./src/gui/symbol/window.$(OBJEXT) \
 	./src/gui/value/color.$(OBJEXT) \
+	./src/gui/value/image.$(OBJEXT) ./src/gui/value/text.$(OBJEXT) \
 	./src/gui/value/symbol.$(OBJEXT) \
 	./src/gui/value/multiple_choice.$(OBJEXT) \
-	./src/gui/value/choice.$(OBJEXT) \
-	./src/gui/value/text.$(OBJEXT) ./src/gui/value/image.$(OBJEXT) \
 	./src/gui/value/editor.$(OBJEXT) \
-	./src/gui/image_slice_window.$(OBJEXT) \
+	./src/gui/value/choice.$(OBJEXT) ./src/gui/util.$(OBJEXT) \
-	./src/gui/thumbnail_thread.$(OBJEXT) \
+	./src/gui/card_select_window.$(OBJEXT) \
-	./src/gui/print_window.$(OBJEXT) \
 	./src/gui/about_window.$(OBJEXT) \
-	./src/gui/symbol/point_editor.$(OBJEXT) \
-	./src/gui/symbol/basic_shape_editor.$(OBJEXT) \
-	./src/gui/symbol/control.$(OBJEXT) \
-	./src/gui/symbol/select_editor.$(OBJEXT) \
-	./src/gui/symbol/editor.$(OBJEXT) \
-	./src/gui/symbol/part_list.$(OBJEXT) \
-	./src/gui/symbol/window.$(OBJEXT) \
 	./src/gui/update_checker.$(OBJEXT) \
-	./src/gui/new_window.$(OBJEXT) ./src/gui/icon_menu.$(OBJEXT) \
+	./src/gui/thumbnail_thread.$(OBJEXT) \
-	./src/gui/util.$(OBJEXT) ./src/data/field.$(OBJEXT) \
+	./src/gui/icon_menu.$(OBJEXT) ./src/gui/new_window.$(OBJEXT) \
-	./src/data/field/color.$(OBJEXT) \
+	./src/gui/preferences_window.$(OBJEXT) \
+	./src/gui/welcome_window.$(OBJEXT) \
+	./src/gui/print_window.$(OBJEXT) \
+	./src/gui/drop_down_list.$(OBJEXT) \
+	./src/gui/image_slice_window.$(OBJEXT) \
+	./src/script/script_manager.$(OBJEXT) \
+	./src/script/script.$(OBJEXT) ./src/script/functions.$(OBJEXT) \
+	./src/script/value.$(OBJEXT) ./src/script/dependency.$(OBJEXT) \
+	./src/script/image.$(OBJEXT) ./src/script/context.$(OBJEXT) \
+	./src/script/scriptable.$(OBJEXT) \
+	./src/script/parser.$(OBJEXT) ./src/data/field/color.$(OBJEXT) \
+	./src/data/field/boolean.$(OBJEXT) \
+	./src/data/field/image.$(OBJEXT) \
+	./src/data/field/text.$(OBJEXT) \
 	./src/data/field/symbol.$(OBJEXT) \
 	./src/data/field/multiple_choice.$(OBJEXT) \
 	./src/data/field/choice.$(OBJEXT) \
-	./src/data/field/boolean.$(OBJEXT) \
+	./src/data/format/clipboard.$(OBJEXT) \
-	./src/data/field/text.$(OBJEXT) \
-	./src/data/field/image.$(OBJEXT) ./src/data/symbol.$(OBJEXT) \
-	./src/data/stylesheet.$(OBJEXT) ./src/data/set.$(OBJEXT) \
-	./src/data/font.$(OBJEXT) ./src/data/locale.$(OBJEXT) \
-	./src/data/symbol_font.$(OBJEXT) \
-	./src/data/action/symbol.$(OBJEXT) \
-	./src/data/action/set.$(OBJEXT) \
-	./src/data/action/symbol_part.$(OBJEXT) \
-	./src/data/action/value.$(OBJEXT) ./src/data/card.$(OBJEXT) \
-	./src/data/format/html.$(OBJEXT) \
-	./src/data/format/apprentice.$(OBJEXT) \
-	./src/data/format/mtg_editor.$(OBJEXT) \
-	./src/data/format/formats.$(OBJEXT) \
 	./src/data/format/image.$(OBJEXT) \
-	./src/data/format/mws.$(OBJEXT) \
+	./src/data/format/html.$(OBJEXT) \
 	./src/data/format/mse1.$(OBJEXT) \
 	./src/data/format/mse2.$(OBJEXT) \
-	./src/data/format/clipboard.$(OBJEXT) \
+	./src/data/format/mws.$(OBJEXT) \
-	./src/data/statistics.$(OBJEXT) ./src/data/settings.$(OBJEXT) \
+	./src/data/format/apprentice.$(OBJEXT) \
-	./src/data/keyword.$(OBJEXT) ./src/data/game.$(OBJEXT) \
+	./src/data/format/formats.$(OBJEXT) \
-	./src/util/io/package.$(OBJEXT) ./src/util/io/writer.$(OBJEXT) \
+	./src/data/format/mtg_editor.$(OBJEXT) \
+	./src/data/format/image_to_symbol.$(OBJEXT) \
+	./src/data/action/symbol.$(OBJEXT) \
+	./src/data/action/set.$(OBJEXT) \
+	./src/data/action/symbol_part.$(OBJEXT) \
+	./src/data/action/value.$(OBJEXT) ./src/data/locale.$(OBJEXT) \
+	./src/data/settings.$(OBJEXT) ./src/data/symbol.$(OBJEXT) \
+	./src/data/font.$(OBJEXT) ./src/data/game.$(OBJEXT) \
+	./src/data/card.$(OBJEXT) ./src/data/field.$(OBJEXT) \
+	./src/data/keyword.$(OBJEXT) ./src/data/stylesheet.$(OBJEXT) \
+	./src/data/statistics.$(OBJEXT) ./src/data/set.$(OBJEXT) \
+	./src/data/symbol_font.$(OBJEXT) \
 	./src/util/io/get_member.$(OBJEXT) \
 	./src/util/io/reader.$(OBJEXT) \
 	./src/util/io/package_manager.$(OBJEXT) \
+	./src/util/io/package.$(OBJEXT) ./src/util/io/writer.$(OBJEXT) \
 	./src/util/rotation.$(OBJEXT) \
-	./src/util/action_stack.$(OBJEXT) \
+	./src/util/tagged_string.$(OBJEXT) \
+	./src/util/action_stack.$(OBJEXT) ./src/util/string.$(OBJEXT) \
 	./src/util/alignment.$(OBJEXT) ./src/util/version.$(OBJEXT) \
-	./src/util/string.$(OBJEXT) ./src/util/tagged_string.$(OBJEXT) \
+	./src/util/error.$(OBJEXT) ./src/util/age.$(OBJEXT) \
-	./src/util/age.$(OBJEXT) ./src/util/error.$(OBJEXT) \
+	./src/main.$(OBJEXT) ./src/code_template.$(OBJEXT)
-	./src/main.$(OBJEXT) ./src/code_template.$(OBJEXT) \
-	./src/render/card/viewer.$(OBJEXT) \
-	./src/render/text/symbol.$(OBJEXT) \
-	./src/render/text/font.$(OBJEXT) \
-	./src/render/text/compound.$(OBJEXT) \
-	./src/render/text/viewer.$(OBJEXT) \
-	./src/render/text/element.$(OBJEXT) \
-	./src/render/value/color.$(OBJEXT) \
-	./src/render/value/symbol.$(OBJEXT) \
-	./src/render/value/multiple_choice.$(OBJEXT) \
-	./src/render/value/choice.$(OBJEXT) \
-	./src/render/value/text.$(OBJEXT) \
-	./src/render/value/image.$(OBJEXT) \
-	./src/render/value/viewer.$(OBJEXT) \
-	./src/render/symbol/filter.$(OBJEXT) \
-	./src/render/symbol/viewer.$(OBJEXT) \
-	./src/script/parser.$(OBJEXT) ./src/script/functions.$(OBJEXT) \
-	./src/script/image.$(OBJEXT) ./src/script/dependency.$(OBJEXT) \
-	./src/script/value.$(OBJEXT) ./src/script/script.$(OBJEXT) \
-	./src/script/context.$(OBJEXT) \
-	./src/script/script_manager.$(OBJEXT) \
-	./src/script/scriptable.$(OBJEXT)
 magicseteditor_OBJECTS = $(am_magicseteditor_OBJECTS)
 magicseteditor_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
@@ -193,13 +190,13 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/twanvl/mse/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run aclocal-1.9
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/twanvl/mse/missing --run tar
+AMTAR = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/twanvl/mse/missing --run autoconf
+AUTOCONF = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/twanvl/mse/missing --run autoheader
+AUTOHEADER = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/twanvl/mse/missing --run automake-1.9
+AUTOMAKE = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run automake-1.9
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -215,8 +212,9 @@ DEPDIR = .deps
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
+GREP = /bin/grep
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -225,7 +223,7 @@ LDFLAGS =
 LIBOBJS = 
 LIBS = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/twanvl/mse/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run makeinfo
 OBJEXT = o
 PACKAGE = magicseteditor
 PACKAGE_BUGREPORT = twanvl@users.sourceforge.net
@@ -235,21 +233,20 @@ PACKAGE_TARNAME = magicseteditor
 PACKAGE_VERSION = 0.3.0
 PATH_SEPARATOR = :
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = 
 VERSION = 0.3.0
-WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA 
+WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA 
 WX_CFLAGS_ONLY = 
 WX_CONFIG_PATH = /usr/bin/wx-config
-WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
-WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA  
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA  
-WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
+WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
 WX_LIBS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
-WX_LIBS_STATIC = 
+WX_LIBS_STATIC =  -pthread    /usr/lib/libwx_gtk-2.4.a -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXi -lXext -lX11 -lm -lpng -ljpeg -ltiff -lz -ldl -lm 
-WX_VERSION = 2.6.1
+WX_VERSION = 2.6.3
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_STRIP = 
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
 am__fastdepCXX_FALSE = #
@@ -261,20 +258,27 @@ am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
 build_alias = 
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 host_alias = 
+htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/info
+infodir = ${datarootdir}/info
-install_sh = /home/twanvl/mse/install-sh
+install_sh = /home/coppro/C++/MSE/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${datarootdir}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
+pdfdir = ${docdir}
 prefix = /usr/local
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
@@ -282,82 +286,83 @@ target_alias =
 # This flag allows us to use subdirectories:
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
+AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
 AM_LDFLAGS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
-# List of source files, generated using:
+# The script used to generate is MakeAM. 
-# find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./"
+magicseteditor_SOURCES = ./src/render/text/viewer.cpp \
-magicseteditor_SOURCES = ./src/gfx/color.cpp ./src/gfx/bezier.cpp \
+	./src/render/text/compound.cpp ./src/render/text/symbol.cpp \
-	./src/gfx/blend_image.cpp ./src/gfx/resample_image.cpp \
+	./src/render/text/font.cpp ./src/render/text/element.cpp \
-	./src/gfx/resample_text.cpp ./src/gfx/image_effects.cpp \
+	./src/render/symbol/viewer.cpp ./src/render/symbol/filter.cpp \
-	./src/gfx/rotate_image.cpp ./src/gfx/combine_image.cpp \
+	./src/render/card/viewer.cpp ./src/render/value/color.cpp \
-	./src/gfx/polynomial.cpp ./src/gfx/mask_image.cpp \
+	./src/render/value/viewer.cpp ./src/render/value/image.cpp \
-	./src/gui/set/stats_panel.cpp ./src/gui/set/panel.cpp \
+	./src/render/value/text.cpp ./src/render/value/symbol.cpp \
-	./src/gui/set/set_info_panel.cpp ./src/gui/set/style_panel.cpp \
+	./src/render/value/multiple_choice.cpp \
-	./src/gui/set/keywords_panel.cpp ./src/gui/set/window.cpp \
+	./src/render/value/choice.cpp ./src/gfx/rotate_image.cpp \
-	./src/gui/set/cards_panel.cpp \
+	./src/gfx/color.cpp ./src/gfx/bezier.cpp \
-	./src/gui/control/card_viewer.cpp \
+	./src/gfx/combine_image.cpp ./src/gfx/image_effects.cpp \
-	./src/gui/control/filtered_card_list.cpp \
+	./src/gfx/polynomial.cpp ./src/gfx/blend_image.cpp \
+	./src/gfx/resample_image.cpp ./src/gfx/resample_text.cpp \
+	./src/gfx/mask_image.cpp \
 	./src/gui/control/select_card_list.cpp \
-	./src/gui/control/package_list.cpp \
+	./src/gui/control/graph.cpp \
-	./src/gui/control/gallery_list.cpp ./src/gui/control/graph.cpp \
 	./src/gui/control/image_card_list.cpp \
 	./src/gui/control/card_list.cpp \
-	./src/gui/control/card_list_column_select.cpp \
+	./src/gui/control/text_ctrl.cpp \
 	./src/gui/control/native_look_editor.cpp \
 	./src/gui/control/card_editor.cpp \
-	./src/gui/control/text_ctrl.cpp \
+	./src/gui/control/card_list_column_select.cpp \
-	./src/gui/preferences_window.cpp ./src/gui/drop_down_list.cpp \
+	./src/gui/control/filtered_card_list.cpp \
-	./src/gui/card_select_window.cpp ./src/gui/welcome_window.cpp \
+	./src/gui/control/package_list.cpp \
-	./src/gui/value/color.cpp ./src/gui/value/symbol.cpp \
+	./src/gui/control/gallery_list.cpp \
-	./src/gui/value/multiple_choice.cpp ./src/gui/value/choice.cpp \
+	./src/gui/control/card_viewer.cpp \
-	./src/gui/value/text.cpp ./src/gui/value/image.cpp \
+	./src/gui/set/style_panel.cpp ./src/gui/set/panel.cpp \
-	./src/gui/value/editor.cpp ./src/gui/image_slice_window.cpp \
+	./src/gui/set/set_info_panel.cpp \
-	./src/gui/thumbnail_thread.cpp ./src/gui/print_window.cpp \
+	./src/gui/set/keywords_panel.cpp ./src/gui/set/window.cpp \
-	./src/gui/about_window.cpp ./src/gui/symbol/point_editor.cpp \
+	./src/gui/set/cards_panel.cpp ./src/gui/set/stats_panel.cpp \
+	./src/gui/symbol/select_editor.cpp \
+	./src/gui/symbol/point_editor.cpp ./src/gui/symbol/control.cpp \
+	./src/gui/symbol/part_list.cpp ./src/gui/symbol/editor.cpp \
 	./src/gui/symbol/basic_shape_editor.cpp \
-	./src/gui/symbol/control.cpp \
+	./src/gui/symbol/window.cpp ./src/gui/value/color.cpp \
-	./src/gui/symbol/select_editor.cpp ./src/gui/symbol/editor.cpp \
+	./src/gui/value/image.cpp ./src/gui/value/text.cpp \
-	./src/gui/symbol/part_list.cpp ./src/gui/symbol/window.cpp \
+	./src/gui/value/symbol.cpp ./src/gui/value/multiple_choice.cpp \
-	./src/gui/update_checker.cpp ./src/gui/new_window.cpp \
+	./src/gui/value/editor.cpp ./src/gui/value/choice.cpp \
-	./src/gui/icon_menu.cpp ./src/gui/util.cpp \
+	./src/gui/util.cpp ./src/gui/card_select_window.cpp \
-	./src/data/field.cpp ./src/data/field/color.cpp \
+	./src/gui/about_window.cpp ./src/gui/update_checker.cpp \
-	./src/data/field/symbol.cpp \
+	./src/gui/thumbnail_thread.cpp ./src/gui/icon_menu.cpp \
+	./src/gui/new_window.cpp ./src/gui/preferences_window.cpp \
+	./src/gui/welcome_window.cpp ./src/gui/print_window.cpp \
+	./src/gui/drop_down_list.cpp ./src/gui/image_slice_window.cpp \
+	./src/script/script_manager.cpp ./src/script/script.cpp \
+	./src/script/functions.cpp ./src/script/value.cpp \
+	./src/script/dependency.cpp ./src/script/image.cpp \
+	./src/script/context.cpp ./src/script/scriptable.cpp \
+	./src/script/parser.cpp ./src/data/field/color.cpp \
+	./src/data/field/boolean.cpp ./src/data/field/image.cpp \
+	./src/data/field/text.cpp ./src/data/field/symbol.cpp \
 	./src/data/field/multiple_choice.cpp \
-	./src/data/field/choice.cpp ./src/data/field/boolean.cpp \
+	./src/data/field/choice.cpp ./src/data/format/clipboard.cpp \
-	./src/data/field/text.cpp ./src/data/field/image.cpp \
+	./src/data/format/image.cpp ./src/data/format/html.cpp \
-	./src/data/symbol.cpp ./src/data/stylesheet.cpp \
-	./src/data/set.cpp ./src/data/font.cpp ./src/data/locale.cpp \
-	./src/data/symbol_font.cpp ./src/data/action/symbol.cpp \
-	./src/data/action/set.cpp ./src/data/action/symbol_part.cpp \
-	./src/data/action/value.cpp ./src/data/card.cpp \
-	./src/data/format/html.cpp ./src/data/format/apprentice.cpp \
-	./src/data/format/mtg_editor.cpp ./src/data/format/formats.cpp \
-	./src/data/format/image.cpp ./src/data/format/mws.cpp \
 	./src/data/format/mse1.cpp ./src/data/format/mse2.cpp \
-	./src/data/format/clipboard.cpp ./src/data/statistics.cpp \
+	./src/data/format/mws.cpp ./src/data/format/apprentice.cpp \
-	./src/data/settings.cpp ./src/data/keyword.cpp \
+	./src/data/format/formats.cpp ./src/data/format/mtg_editor.cpp \
-	./src/data/game.cpp ./src/util/io/package.cpp \
+	./src/data/format/image_to_symbol.cpp \
-	./src/util/io/writer.cpp ./src/util/io/get_member.cpp \
+	./src/data/action/symbol.cpp ./src/data/action/set.cpp \
+	./src/data/action/symbol_part.cpp ./src/data/action/value.cpp \
+	./src/data/locale.cpp ./src/data/settings.cpp \
+	./src/data/symbol.cpp ./src/data/font.cpp ./src/data/game.cpp \
+	./src/data/card.cpp ./src/data/field.cpp \
+	./src/data/keyword.cpp ./src/data/stylesheet.cpp \
+	./src/data/statistics.cpp ./src/data/set.cpp \
+	./src/data/symbol_font.cpp ./src/util/io/get_member.cpp \
 	./src/util/io/reader.cpp ./src/util/io/package_manager.cpp \
-	./src/util/rotation.cpp ./src/util/action_stack.cpp \
+	./src/util/io/package.cpp ./src/util/io/writer.cpp \
+	./src/util/rotation.cpp ./src/util/tagged_string.cpp \
+	./src/util/action_stack.cpp ./src/util/string.cpp \
 	./src/util/alignment.cpp ./src/util/version.cpp \
-	./src/util/string.cpp ./src/util/tagged_string.cpp \
+	./src/util/error.cpp ./src/util/age.cpp ./src/main.cpp \
-	./src/util/age.cpp ./src/util/error.cpp ./src/main.cpp \
+	./src/code_template.cpp
-	./src/code_template.cpp ./src/render/card/viewer.cpp \
-	./src/render/text/symbol.cpp ./src/render/text/font.cpp \
-	./src/render/text/compound.cpp ./src/render/text/viewer.cpp \
-	./src/render/text/element.cpp ./src/render/value/color.cpp \
-	./src/render/value/symbol.cpp \
-	./src/render/value/multiple_choice.cpp \
-	./src/render/value/choice.cpp ./src/render/value/text.cpp \
-	./src/render/value/image.cpp ./src/render/value/viewer.cpp \
-	./src/render/symbol/filter.cpp ./src/render/symbol/viewer.cpp \
-	./src/script/parser.cpp ./src/script/functions.cpp \
-	./src/script/image.cpp ./src/script/dependency.cpp \
-	./src/script/value.cpp ./src/script/script.cpp \
-	./src/script/context.cpp ./src/script/script_manager.cpp \
-	./src/script/scriptable.cpp
 all: all-am
 .SUFFIXES:
@@ -435,399 +440,392 @@ uninstall-binPROGRAMS:
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-./src/gfx/$(am__dirstamp):
+src/render/text/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/text
+	@: > src/render/text/$(am__dirstamp)
+src/render/text/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/text/$(DEPDIR)
+	@: > src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/viewer.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/compound.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/symbol.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/font.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/element.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+src/render/symbol/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/symbol
+	@: > src/render/symbol/$(am__dirstamp)
+src/render/symbol/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/symbol/$(DEPDIR)
+	@: > src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/render/symbol/viewer.$(OBJEXT):  \
+	src/render/symbol/$(am__dirstamp) \
+	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/render/symbol/filter.$(OBJEXT):  \
+	src/render/symbol/$(am__dirstamp) \
+	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+src/render/card/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/card
+	@: > src/render/card/$(am__dirstamp)
+src/render/card/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/card/$(DEPDIR)
+	@: > src/render/card/$(DEPDIR)/$(am__dirstamp)
+./src/render/card/viewer.$(OBJEXT): src/render/card/$(am__dirstamp) \
+	src/render/card/$(DEPDIR)/$(am__dirstamp)
+src/render/value/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/value
+	@: > src/render/value/$(am__dirstamp)
+src/render/value/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) ./src/render/value/$(DEPDIR)
+	@: > src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/color.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/viewer.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/image.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/text.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/symbol.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/multiple_choice.$(OBJEXT):  \
+	src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/choice.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+src/gfx/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx
-	@: > ./src/gfx/$(am__dirstamp)
+	@: > src/gfx/$(am__dirstamp)
-./src/gfx/$(DEPDIR)/$(am__dirstamp):
+src/gfx/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx/$(DEPDIR)
-	@: > ./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/color.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/rotate_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/bezier.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/color.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/blend_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/bezier.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/combine_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_text.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/image_effects.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/image_effects.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/polynomial.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/rotate_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/blend_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/combine_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/resample_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/polynomial.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/resample_text.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/mask_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
+./src/gfx/mask_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/$(am__dirstamp):
+src/gui/control/$(am__dirstamp):
-	@$(mkdir_p) ./src/gui/set
-	@: > ./src/gui/set/$(am__dirstamp)
-./src/gui/set/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/gui/set/$(DEPDIR)
-	@: > ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/stats_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/set_info_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/style_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/keywords_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/window.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/cards_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control
-	@: > ./src/gui/control/$(am__dirstamp)
+	@: > src/gui/control/$(am__dirstamp)
-./src/gui/control/$(DEPDIR)/$(am__dirstamp):
+src/gui/control/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control/$(DEPDIR)
-	@: > ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/card_viewer.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/filtered_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/select_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/package_list.$(OBJEXT):  \
+./src/gui/control/graph.$(OBJEXT): src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/gallery_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/graph.$(OBJEXT): ./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/image_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/card_list_column_select.$(OBJEXT):  \
+./src/gui/control/text_ctrl.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/native_look_editor.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_editor.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/text_ctrl.$(OBJEXT):  \
+./src/gui/control/card_list_column_select.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/$(am__dirstamp):
+./src/gui/control/filtered_card_list.$(OBJEXT):  \
-	@$(mkdir_p) ./src/gui
+	src/gui/control/$(am__dirstamp) \
-	@: > ./src/gui/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/$(DEPDIR)/$(am__dirstamp):
+./src/gui/control/package_list.$(OBJEXT):  \
-	@$(mkdir_p) ./src/gui/$(DEPDIR)
+	src/gui/control/$(am__dirstamp) \
-	@: > ./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/preferences_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+./src/gui/control/gallery_list.$(OBJEXT):  \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
-./src/gui/drop_down_list.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/control/card_viewer.$(OBJEXT):  \
-./src/gui/card_select_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	src/gui/control/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/welcome_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+src/gui/set/$(am__dirstamp):
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	@$(mkdir_p) ./src/gui/set
-./src/gui/value/$(am__dirstamp):
+	@: > src/gui/set/$(am__dirstamp)
-	@$(mkdir_p) ./src/gui/value
+src/gui/set/$(DEPDIR)/$(am__dirstamp):
-	@: > ./src/gui/value/$(am__dirstamp)
+	@$(mkdir_p) ./src/gui/set/$(DEPDIR)
-./src/gui/value/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	@$(mkdir_p) ./src/gui/value/$(DEPDIR)
+./src/gui/set/style_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	@: > ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/color.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+./src/gui/set/panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/symbol.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+./src/gui/set/set_info_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/multiple_choice.$(OBJEXT):  \
+./src/gui/set/keywords_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-	./src/gui/value/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/window.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-./src/gui/value/choice.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/cards_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-./src/gui/value/text.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/stats_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
-./src/gui/value/image.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+src/gui/symbol/$(am__dirstamp):
-./src/gui/value/editor.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/image_slice_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/thumbnail_thread.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/print_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/about_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol
-	@: > ./src/gui/symbol/$(am__dirstamp)
+	@: > src/gui/symbol/$(am__dirstamp)
-./src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
+src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol/$(DEPDIR)
-	@: > ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/select_editor.$(OBJEXT):  \
+	src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/point_editor.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/control.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/part_list.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/editor.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/basic_shape_editor.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/control.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+./src/gui/symbol/window.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/select_editor.$(OBJEXT):  \
+src/gui/value/$(am__dirstamp):
-	./src/gui/symbol/$(am__dirstamp) \
+	@$(mkdir_p) ./src/gui/value
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/value/$(am__dirstamp)
-./src/gui/symbol/editor.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+src/gui/value/$(DEPDIR)/$(am__dirstamp):
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	@$(mkdir_p) ./src/gui/value/$(DEPDIR)
-./src/gui/symbol/part_list.$(OBJEXT):  \
+	@: > src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/symbol/$(am__dirstamp) \
+./src/gui/value/color.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/window.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
+./src/gui/value/image.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/update_checker.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+./src/gui/value/text.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/new_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+./src/gui/value/symbol.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/icon_menu.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+./src/gui/value/multiple_choice.$(OBJEXT):  \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+	src/gui/value/$(am__dirstamp) \
-./src/gui/util.$(OBJEXT): ./src/gui/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/editor.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-./src/data/$(am__dirstamp):
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	@$(mkdir_p) ./src/data
+./src/gui/value/choice.$(OBJEXT): src/gui/value/$(am__dirstamp) \
-	@: > ./src/data/$(am__dirstamp)
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/data/$(DEPDIR)/$(am__dirstamp):
+src/gui/$(am__dirstamp):
-	@$(mkdir_p) ./src/data/$(DEPDIR)
+	@$(mkdir_p) ./src/gui
-	@: > ./src/data/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/$(am__dirstamp)
-./src/data/field.$(OBJEXT): ./src/data/$(am__dirstamp) \
+src/gui/$(DEPDIR)/$(am__dirstamp):
-	./src/data/$(DEPDIR)/$(am__dirstamp)
+	@$(mkdir_p) ./src/gui/$(DEPDIR)
-./src/data/field/$(am__dirstamp):
+	@: > src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/util.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/card_select_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/about_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/update_checker.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/thumbnail_thread.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/icon_menu.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/new_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/preferences_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/welcome_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/print_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/drop_down_list.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/image_slice_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+src/script/$(am__dirstamp):
+	@$(mkdir_p) ./src/script
+	@: > src/script/$(am__dirstamp)
+src/script/$(DEPDIR)/$(am__dirstamp):
+	@$(mkdir_p) ./src/script/$(DEPDIR)
+	@: > src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script_manager.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/functions.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/value.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/dependency.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/image.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/context.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/scriptable.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/parser.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+src/data/field/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field
-	@: > ./src/data/field/$(am__dirstamp)
+	@: > src/data/field/$(am__dirstamp)
-./src/data/field/$(DEPDIR)/$(am__dirstamp):
+src/data/field/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field/$(DEPDIR)
-	@: > ./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/color.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+./src/data/field/color.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/symbol.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+./src/data/field/boolean.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/image.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/text.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/symbol.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
 ./src/data/field/multiple_choice.$(OBJEXT):  \
-	./src/data/field/$(am__dirstamp) \
+	src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/choice.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+./src/data/field/choice.$(OBJEXT): src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/boolean.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
+src/data/format/$(am__dirstamp):
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/text.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/image.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/stylesheet.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/set.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/font.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/locale.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol_font.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/$(am__dirstamp):
-	@$(mkdir_p) ./src/data/action
-	@: > ./src/data/action/$(am__dirstamp)
-./src/data/action/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/data/action/$(DEPDIR)
-	@: > ./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/symbol.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/set.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/symbol_part.$(OBJEXT):  \
-	./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/value.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/card.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format
-	@: > ./src/data/format/$(am__dirstamp)
+	@: > src/data/format/$(am__dirstamp)
-./src/data/format/$(DEPDIR)/$(am__dirstamp):
+src/data/format/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format/$(DEPDIR)
-	@: > ./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/html.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+./src/data/format/clipboard.$(OBJEXT):  \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/image.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/html.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse1.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse2.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mws.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/apprentice.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
+	src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/formats.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/mtg_editor.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
+	src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/formats.$(OBJEXT):  \
+./src/data/format/image_to_symbol.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
+	src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/image.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+src/data/action/$(am__dirstamp):
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	@$(mkdir_p) ./src/data/action
-./src/data/format/mws.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	@: > src/data/action/$(am__dirstamp)
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+src/data/action/$(DEPDIR)/$(am__dirstamp):
-./src/data/format/mse1.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+	@$(mkdir_p) ./src/data/action/$(DEPDIR)
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mse2.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
+./src/data/action/symbol.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/clipboard.$(OBJEXT):  \
+./src/data/action/set.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	./src/data/format/$(am__dirstamp) \
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/symbol_part.$(OBJEXT):  \
-./src/data/statistics.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	src/data/action/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/settings.$(OBJEXT): ./src/data/$(am__dirstamp) \
+./src/data/action/value.$(OBJEXT): src/data/action/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/keyword.$(OBJEXT): ./src/data/$(am__dirstamp) \
+src/data/$(am__dirstamp):
-	./src/data/$(DEPDIR)/$(am__dirstamp)
+	@$(mkdir_p) ./src/data
-./src/data/game.$(OBJEXT): ./src/data/$(am__dirstamp) \
+	@: > src/data/$(am__dirstamp)
-	./src/data/$(DEPDIR)/$(am__dirstamp)
+src/data/$(DEPDIR)/$(am__dirstamp):
-./src/util/io/$(am__dirstamp):
+	@$(mkdir_p) ./src/data/$(DEPDIR)
+	@: > src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/locale.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/settings.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/font.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/game.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/card.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/field.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/keyword.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/stylesheet.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/statistics.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/set.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol_font.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+src/util/io/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io
-	@: > ./src/util/io/$(am__dirstamp)
+	@: > src/util/io/$(am__dirstamp)
-./src/util/io/$(DEPDIR)/$(am__dirstamp):
+src/util/io/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io/$(DEPDIR)
-	@: > ./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	@: > src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+./src/util/io/get_member.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/writer.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+./src/util/io/reader.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/get_member.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+./src/util/io/package_manager.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/reader.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
+./src/util/io/package.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package_manager.$(OBJEXT):  \
+./src/util/io/writer.$(OBJEXT): src/util/io/$(am__dirstamp) \
-	./src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
+src/util/$(am__dirstamp):
-./src/util/$(am__dirstamp):
 	@$(mkdir_p) ./src/util
-	@: > ./src/util/$(am__dirstamp)
+	@: > src/util/$(am__dirstamp)
-./src/util/$(DEPDIR)/$(am__dirstamp):
+src/util/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/$(DEPDIR)
-	@: > ./src/util/$(DEPDIR)/$(am__dirstamp)
+	@: > src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/rotation.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/rotation.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/action_stack.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/tagged_string.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/alignment.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/action_stack.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/version.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/string.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/string.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/alignment.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/tagged_string.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/version.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/age.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/error.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/error.$(OBJEXT): ./src/util/$(am__dirstamp) \
+./src/util/age.$(OBJEXT): src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
+	src/util/$(DEPDIR)/$(am__dirstamp)
-./src/$(am__dirstamp):
+src/$(am__dirstamp):
 	@$(mkdir_p) ./src
-	@: > ./src/$(am__dirstamp)
+	@: > src/$(am__dirstamp)
-./src/$(DEPDIR)/$(am__dirstamp):
+src/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/$(DEPDIR)
-	@: > ./src/$(DEPDIR)/$(am__dirstamp)
+	@: > src/$(DEPDIR)/$(am__dirstamp)
-./src/main.$(OBJEXT): ./src/$(am__dirstamp) \
+./src/main.$(OBJEXT): src/$(am__dirstamp) \
-	./src/$(DEPDIR)/$(am__dirstamp)
+	src/$(DEPDIR)/$(am__dirstamp)
-./src/code_template.$(OBJEXT): ./src/$(am__dirstamp) \
+./src/code_template.$(OBJEXT): src/$(am__dirstamp) \
-	./src/$(DEPDIR)/$(am__dirstamp)
+	src/$(DEPDIR)/$(am__dirstamp)
-./src/render/card/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/card
-	@: > ./src/render/card/$(am__dirstamp)
-./src/render/card/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/card/$(DEPDIR)
-	@: > ./src/render/card/$(DEPDIR)/$(am__dirstamp)
-./src/render/card/viewer.$(OBJEXT): ./src/render/card/$(am__dirstamp) \
-	./src/render/card/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/text
-	@: > ./src/render/text/$(am__dirstamp)
-./src/render/text/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/text/$(DEPDIR)
-	@: > ./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/symbol.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/font.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/compound.$(OBJEXT):  \
-	./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/viewer.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/element.$(OBJEXT):  \
-	./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/value
-	@: > ./src/render/value/$(am__dirstamp)
-./src/render/value/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/value/$(DEPDIR)
-	@: > ./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/color.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/symbol.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/multiple_choice.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/choice.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/text.$(OBJEXT): ./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/image.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/viewer.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/symbol/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/symbol
-	@: > ./src/render/symbol/$(am__dirstamp)
-./src/render/symbol/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/render/symbol/$(DEPDIR)
-	@: > ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/render/symbol/filter.$(OBJEXT):  \
-	./src/render/symbol/$(am__dirstamp) \
-	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/render/symbol/viewer.$(OBJEXT):  \
-	./src/render/symbol/$(am__dirstamp) \
-	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/script/$(am__dirstamp):
-	@$(mkdir_p) ./src/script
-	@: > ./src/script/$(am__dirstamp)
-./src/script/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) ./src/script/$(DEPDIR)
-	@: > ./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/parser.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/functions.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/image.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/dependency.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/value.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/context.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script_manager.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/scriptable.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
 magicseteditor$(EXEEXT): $(magicseteditor_OBJECTS) $(magicseteditor_DEPENDENCIES) 
 	@rm -f magicseteditor$(EXEEXT)
 	$(CXXLINK) $(magicseteditor_LDFLAGS) $(magicseteditor_OBJECTS) $(magicseteditor_LDADD) $(LIBS)
@@ -854,6 +852,7 @@ mostlyclean-compile:
 	-rm -f ./src/data/format/formats.$(OBJEXT)
 	-rm -f ./src/data/format/html.$(OBJEXT)
 	-rm -f ./src/data/format/image.$(OBJEXT)
+	-rm -f ./src/data/format/image_to_symbol.$(OBJEXT)
 	-rm -f ./src/data/format/mse1.$(OBJEXT)
 	-rm -f ./src/data/format/mse2.$(OBJEXT)
 	-rm -f ./src/data/format/mtg_editor.$(OBJEXT)
@@ -994,6 +993,7 @@ include ./src/data/format/$(DEPDIR)/clipboard.Po
 include ./src/data/format/$(DEPDIR)/formats.Po
 include ./src/data/format/$(DEPDIR)/html.Po
 include ./src/data/format/$(DEPDIR)/image.Po
+include ./src/data/format/$(DEPDIR)/image_to_symbol.Po
 include ./src/data/format/$(DEPDIR)/mse1.Po
 include ./src/data/format/$(DEPDIR)/mse2.Po
 include ./src/data/format/$(DEPDIR)/mtg_editor.Po
@@ -1310,42 +1310,42 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f ./src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/$(am__dirstamp)
+	-rm -f src/$(am__dirstamp)
-	-rm -f ./src/data/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/$(am__dirstamp)
+	-rm -f src/data/$(am__dirstamp)
-	-rm -f ./src/data/action/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/action/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/action/$(am__dirstamp)
+	-rm -f src/data/action/$(am__dirstamp)
-	-rm -f ./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/field/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/field/$(am__dirstamp)
+	-rm -f src/data/field/$(am__dirstamp)
-	-rm -f ./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/format/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/format/$(am__dirstamp)
+	-rm -f src/data/format/$(am__dirstamp)
-	-rm -f ./src/gfx/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gfx/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gfx/$(am__dirstamp)
+	-rm -f src/gfx/$(am__dirstamp)
-	-rm -f ./src/gui/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/$(am__dirstamp)
+	-rm -f src/gui/$(am__dirstamp)
-	-rm -f ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/control/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/control/$(am__dirstamp)
+	-rm -f src/gui/control/$(am__dirstamp)
-	-rm -f ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/set/$(am__dirstamp)
+	-rm -f src/gui/set/$(am__dirstamp)
-	-rm -f ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/symbol/$(am__dirstamp)
+	-rm -f src/gui/symbol/$(am__dirstamp)
-	-rm -f ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/value/$(am__dirstamp)
+	-rm -f src/gui/value/$(am__dirstamp)
-	-rm -f ./src/render/card/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/card/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/card/$(am__dirstamp)
+	-rm -f src/render/card/$(am__dirstamp)
-	-rm -f ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/symbol/$(am__dirstamp)
+	-rm -f src/render/symbol/$(am__dirstamp)
-	-rm -f ./src/render/text/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/text/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/text/$(am__dirstamp)
+	-rm -f src/render/text/$(am__dirstamp)
-	-rm -f ./src/render/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/value/$(am__dirstamp)
+	-rm -f src/render/value/$(am__dirstamp)
-	-rm -f ./src/script/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/script/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/script/$(am__dirstamp)
+	-rm -f src/script/$(am__dirstamp)
-	-rm -f ./src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/util/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/util/$(am__dirstamp)
+	-rm -f src/util/$(am__dirstamp)
-	-rm -f ./src/util/io/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/util/io/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/util/io/$(am__dirstamp)
+	-rm -f src/util/io/$(am__dirstamp)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

--- a/Makefile.am
+++ b/Makefile.am
 #+----------------------------------------------------------------------------+
 #| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
 #| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
@@ -11,135 +12,133 @@ bin_PROGRAMS = magicseteditor
 AM_CXXFLAGS = @WX_CXXFLAGS@ -DUNICODE -I . -Wall
 AM_LDFLAGS  = @WX_LIBS@
-magicseteditor_SOURCES =
+magicseteditor_SOURCES = 
-# List of source files, generated using:
-# find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./"
+# The script used to generate is MakeAM. 
+magicseteditor_SOURCES += ./src/render/text/viewer.cpp
+magicseteditor_SOURCES += ./src/render/text/compound.cpp
+magicseteditor_SOURCES += ./src/render/text/symbol.cpp
+magicseteditor_SOURCES += ./src/render/text/font.cpp
+magicseteditor_SOURCES += ./src/render/text/element.cpp
+magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
+magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
+magicseteditor_SOURCES += ./src/render/card/viewer.cpp
+magicseteditor_SOURCES += ./src/render/value/color.cpp
+magicseteditor_SOURCES += ./src/render/value/viewer.cpp
+magicseteditor_SOURCES += ./src/render/value/image.cpp
+magicseteditor_SOURCES += ./src/render/value/text.cpp
+magicseteditor_SOURCES += ./src/render/value/symbol.cpp
+magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/render/value/choice.cpp
+magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
 magicseteditor_SOURCES += ./src/gfx/color.cpp
 magicseteditor_SOURCES += ./src/gfx/bezier.cpp
+magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
+magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
+magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
 magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
 magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
 magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
-magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
-magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
-magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
-magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
 magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
-magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/window.cpp
-magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
-magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
 magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
 magicseteditor_SOURCES += ./src/gui/control/graph.cpp
 magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
 magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
+magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
 magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
 magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
-magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
+magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
-magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
+magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
-magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
+magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/window.cpp
+magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
 magicseteditor_SOURCES += ./src/gui/value/color.cpp
+magicseteditor_SOURCES += ./src/gui/value/image.cpp
+magicseteditor_SOURCES += ./src/gui/value/text.cpp
 magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
 magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/text.cpp
-magicseteditor_SOURCES += ./src/gui/value/image.cpp
 magicseteditor_SOURCES += ./src/gui/value/editor.cpp
-magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
+magicseteditor_SOURCES += ./src/gui/value/choice.cpp
-magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
+magicseteditor_SOURCES += ./src/gui/util.cpp
-magicseteditor_SOURCES += ./src/gui/print_window.cpp
+magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
 magicseteditor_SOURCES += ./src/gui/about_window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
 magicseteditor_SOURCES += ./src/gui/update_checker.cpp
-magicseteditor_SOURCES += ./src/gui/new_window.cpp
+magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
 magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
-magicseteditor_SOURCES += ./src/gui/util.cpp
+magicseteditor_SOURCES += ./src/gui/new_window.cpp
-magicseteditor_SOURCES += ./src/data/field.cpp
+magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
+magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
+magicseteditor_SOURCES += ./src/gui/print_window.cpp
+magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
+magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
+magicseteditor_SOURCES += ./src/script/script_manager.cpp
+magicseteditor_SOURCES += ./src/script/script.cpp
+magicseteditor_SOURCES += ./src/script/functions.cpp
+magicseteditor_SOURCES += ./src/script/value.cpp
+magicseteditor_SOURCES += ./src/script/dependency.cpp
+magicseteditor_SOURCES += ./src/script/image.cpp
+magicseteditor_SOURCES += ./src/script/context.cpp
+magicseteditor_SOURCES += ./src/script/scriptable.cpp
+magicseteditor_SOURCES += ./src/script/parser.cpp
 magicseteditor_SOURCES += ./src/data/field/color.cpp
+magicseteditor_SOURCES += ./src/data/field/boolean.cpp
+magicseteditor_SOURCES += ./src/data/field/image.cpp
+magicseteditor_SOURCES += ./src/data/field/text.cpp
 magicseteditor_SOURCES += ./src/data/field/symbol.cpp
 magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
 magicseteditor_SOURCES += ./src/data/field/choice.cpp
-magicseteditor_SOURCES += ./src/data/field/boolean.cpp
+magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
-magicseteditor_SOURCES += ./src/data/field/text.cpp
-magicseteditor_SOURCES += ./src/data/field/image.cpp
-magicseteditor_SOURCES += ./src/data/symbol.cpp
-magicseteditor_SOURCES += ./src/data/stylesheet.cpp
-magicseteditor_SOURCES += ./src/data/set.cpp
-magicseteditor_SOURCES += ./src/data/font.cpp
-magicseteditor_SOURCES += ./src/data/locale.cpp
-magicseteditor_SOURCES += ./src/data/symbol_font.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol.cpp
-magicseteditor_SOURCES += ./src/data/action/set.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
-magicseteditor_SOURCES += ./src/data/action/value.cpp
-magicseteditor_SOURCES += ./src/data/card.cpp
-magicseteditor_SOURCES += ./src/data/format/html.cpp
-magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
-magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
-magicseteditor_SOURCES += ./src/data/format/formats.cpp
 magicseteditor_SOURCES += ./src/data/format/image.cpp
-magicseteditor_SOURCES += ./src/data/format/mws.cpp
+magicseteditor_SOURCES += ./src/data/format/html.cpp
 magicseteditor_SOURCES += ./src/data/format/mse1.cpp
 magicseteditor_SOURCES += ./src/data/format/mse2.cpp
-magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
+magicseteditor_SOURCES += ./src/data/format/mws.cpp
+magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
+magicseteditor_SOURCES += ./src/data/format/formats.cpp
+magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
 magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
-magicseteditor_SOURCES += ./src/data/statistics.cpp
+magicseteditor_SOURCES += ./src/data/action/symbol.cpp
+magicseteditor_SOURCES += ./src/data/action/set.cpp
+magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
+magicseteditor_SOURCES += ./src/data/action/value.cpp
+magicseteditor_SOURCES += ./src/data/locale.cpp
 magicseteditor_SOURCES += ./src/data/settings.cpp
-magicseteditor_SOURCES += ./src/data/keyword.cpp
+magicseteditor_SOURCES += ./src/data/symbol.cpp
+magicseteditor_SOURCES += ./src/data/font.cpp
 magicseteditor_SOURCES += ./src/data/game.cpp
-magicseteditor_SOURCES += ./src/util/io/package.cpp
+magicseteditor_SOURCES += ./src/data/card.cpp
-magicseteditor_SOURCES += ./src/util/io/writer.cpp
+magicseteditor_SOURCES += ./src/data/field.cpp
+magicseteditor_SOURCES += ./src/data/keyword.cpp
+magicseteditor_SOURCES += ./src/data/stylesheet.cpp
+magicseteditor_SOURCES += ./src/data/statistics.cpp
+magicseteditor_SOURCES += ./src/data/set.cpp
+magicseteditor_SOURCES += ./src/data/symbol_font.cpp
 magicseteditor_SOURCES += ./src/util/io/get_member.cpp
 magicseteditor_SOURCES += ./src/util/io/reader.cpp
 magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
+magicseteditor_SOURCES += ./src/util/io/package.cpp
+magicseteditor_SOURCES += ./src/util/io/writer.cpp
 magicseteditor_SOURCES += ./src/util/rotation.cpp
+magicseteditor_SOURCES += ./src/util/tagged_string.cpp
 magicseteditor_SOURCES += ./src/util/action_stack.cpp
+magicseteditor_SOURCES += ./src/util/string.cpp
 magicseteditor_SOURCES += ./src/util/alignment.cpp
 magicseteditor_SOURCES += ./src/util/version.cpp
-magicseteditor_SOURCES += ./src/util/string.cpp
-magicseteditor_SOURCES += ./src/util/tagged_string.cpp
-magicseteditor_SOURCES += ./src/util/age.cpp
 magicseteditor_SOURCES += ./src/util/error.cpp
+magicseteditor_SOURCES += ./src/util/age.cpp
 magicseteditor_SOURCES += ./src/main.cpp
 magicseteditor_SOURCES += ./src/code_template.cpp
-magicseteditor_SOURCES += ./src/render/card/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/symbol.cpp
-magicseteditor_SOURCES += ./src/render/text/font.cpp
-magicseteditor_SOURCES += ./src/render/text/compound.cpp
-magicseteditor_SOURCES += ./src/render/text/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/element.cpp
-magicseteditor_SOURCES += ./src/render/value/color.cpp
-magicseteditor_SOURCES += ./src/render/value/symbol.cpp
-magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/choice.cpp
-magicseteditor_SOURCES += ./src/render/value/text.cpp
-magicseteditor_SOURCES += ./src/render/value/image.cpp
-magicseteditor_SOURCES += ./src/render/value/viewer.cpp
-magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
-magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
-magicseteditor_SOURCES += ./src/script/parser.cpp
-magicseteditor_SOURCES += ./src/script/functions.cpp
-magicseteditor_SOURCES += ./src/script/image.cpp
-magicseteditor_SOURCES += ./src/script/dependency.cpp
-magicseteditor_SOURCES += ./src/script/value.cpp
-magicseteditor_SOURCES += ./src/script/script.cpp
-magicseteditor_SOURCES += ./src/script/context.cpp
-magicseteditor_SOURCES += ./src/script/script_manager.cpp
-magicseteditor_SOURCES += ./src/script/scriptable.cpp
--- a/config.status
+++ b/config.status
-#! /bin/sh
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/sh}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-as_executable_p="test -f"
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-# CDPATH.
-$as_unset CDPATH
-exec 6>&1
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-This file was extended by magicseteditor $as_me 0.3.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" Makefile"
-config_headers=" src/config.h"
-config_commands=" depfiles"
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-Usage: $0 [OPTIONS] [FILE]...
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-Configuration files:
-$config_files
-Configuration headers:
-$config_headers
-Configuration commands:
-$config_commands
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-magicseteditor config.status 0.3.0
-configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"\"
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/usr/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-  *) ac_config_targets="$ac_config_targets $1" ;;
-  esac
-  shift
-done
-ac_configure_extra_args=
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure "  $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure  $ac_configure_extra_args --no-create --no-recursion
-fi
-#
-# INIT-COMMANDS section.
-#
-AMDEP_TRUE="" ac_aux_dir="."
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-#
-# CONFIG_FILES section.
-#
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/bin/sh,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,magicseteditor,;t t
-s,@PACKAGE_TARNAME@,magicseteditor,;t t
-s,@PACKAGE_VERSION@,0.3.0,;t t
-s,@PACKAGE_STRING@,magicseteditor 0.3.0,;t t
-s,@PACKAGE_BUGREPORT@,twanvl@users.sourceforge.net,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/usr/local,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DHAVE_CONFIG_H,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,,;t t
-s,@INSTALL_PROGRAM@,${INSTALL},;t t
-s,@INSTALL_SCRIPT@,${INSTALL},;t t
-s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@CYGPATH_W@,echo,;t t
-s,@PACKAGE@,magicseteditor,;t t
-s,@VERSION@,0.3.0,;t t
-s,@ACLOCAL@,${SHELL} /home/twanvl/mse/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /home/twanvl/mse/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /home/twanvl/mse/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /home/twanvl/mse/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /home/twanvl/mse/missing --run makeinfo,;t t
-s,@install_sh@,/home/twanvl/mse/install-sh,;t t
-s,@STRIP@,,;t t
-s,@ac_ct_STRIP@,,;t t
-s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
-s,@mkdir_p@,mkdir -p --,;t t
-s,@AWK@,mawk,;t t
-s,@SET_MAKE@,,;t t
-s,@am__leading_dot@,.,;t t
-s,@AMTAR@,${SHELL} /home/twanvl/mse/missing --run tar,;t t
-s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
-s,@am__untar@,${AMTAR} xf -,;t t
-s,@CXX@,g++,;t t
-s,@CXXFLAGS@,-g -O2,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CXX@,g++,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@DEPDIR@,.deps,;t t
-s,@am__include@,include,;t t
-s,@am__quote@,,;t t
-s,@AMDEP_TRUE@,,;t t
-s,@AMDEP_FALSE@,#,;t t
-s,@AMDEPBACKSLASH@,\,;t t
-s,@CXXDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCXX_TRUE@,,;t t
-s,@am__fastdepCXX_FALSE@,#,;t t
-s,@WX_CONFIG_PATH@,/usr/bin/wx-config,;t t
-s,@WX_CPPFLAGS@,-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA,;t t
-s,@WX_CFLAGS@,-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA ,;t t
-s,@WX_CXXFLAGS@,-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA  ,;t t
-s,@WX_CFLAGS_ONLY@,,;t t
-s,@WX_CXXFLAGS_ONLY@,-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA,;t t
-s,@WX_LIBS@,-pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 ,;t t
-s,@WX_LIBS_STATIC@,,;t t
-s,@WX_VERSION@,2.6.1,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-g -O2,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@CCDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCC_TRUE@,,;t t
-s,@am__fastdepCC_FALSE@,#,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
-CEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-done
-#
-# CONFIG_HEADER section.
-#
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-  # Handle all the #define templates only if necessary.
-  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then
-  # If there are no defines, we may have an empty if/fi
-  :
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"magicseteditor"${ac_dD}
-${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"magicseteditor"${ac_dD}
-${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"0.3.0"${ac_dD}
-${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"magicseteditor 0.3.0"${ac_dD}
-${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}"twanvl@users.sourceforge.net"${ac_dD}
-${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"magicseteditor"${ac_dD}
-${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"0.3.0"${ac_dD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MALLOC${ac_dB}HAVE_MALLOC${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_SELECT_H${ac_dB}HAVE_SYS_SELECT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_SOCKET_H${ac_dB}HAVE_SYS_SOCKET_H${ac_dC}1${ac_dD}
-${ac_dA}SELECT_TYPE_ARG1${ac_dB}SELECT_TYPE_ARG1${ac_dC}int${ac_dD}
-${ac_dA}SELECT_TYPE_ARG234${ac_dB}SELECT_TYPE_ARG234${ac_dC}(fd_set *)${ac_dD}
-${ac_dA}SELECT_TYPE_ARG5${ac_dB}SELECT_TYPE_ARG5${ac_dC}(struct timeval *)${ac_dD}
-${ac_dA}HAVE_MEMSET${ac_dB}HAVE_MEMSET${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SELECT${ac_dB}HAVE_SELECT${ac_dC}1${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-  fi # grep
-  # Handle all the #undef templates
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"magicseteditor"${ac_uD}
-${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"magicseteditor"${ac_uD}
-${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"0.3.0"${ac_uD}
-${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"magicseteditor 0.3.0"${ac_uD}
-${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}"twanvl@users.sourceforge.net"${ac_uD}
-${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"magicseteditor"${ac_uD}
-${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"0.3.0"${ac_uD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MALLOC${ac_uB}HAVE_MALLOC${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_SELECT_H${ac_uB}HAVE_SYS_SELECT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_SOCKET_H${ac_uB}HAVE_SYS_SOCKET_H${ac_uC}1${ac_uD}
-${ac_uA}SELECT_TYPE_ARG1${ac_uB}SELECT_TYPE_ARG1${ac_uC}int${ac_uD}
-${ac_uA}SELECT_TYPE_ARG234${ac_uB}SELECT_TYPE_ARG234${ac_uC}(fd_set *)${ac_uD}
-${ac_uA}SELECT_TYPE_ARG5${ac_uB}SELECT_TYPE_ARG5${ac_uC}(struct timeval *)${ac_uD}
-${ac_uA}HAVE_MEMSET${ac_uB}HAVE_MEMSET${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SELECT${ac_uB}HAVE_SELECT${ac_uC}1${ac_uD}
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-{ (exit 0); exit 0; }
--- a/configure
+++ b/configure
--- a/depcomp
+++ b/depcomp
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+rm -f "$tmpdepfile"
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  This file always lives in the current directory.
+  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # $object doesn't have directory information.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  outname="$stripped.o"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+icc)
+  # Must come before tru64.
+  # Intel's C compiler understands `-MD -MF file'.  However
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+tru64)
+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   tmpdepfile1="$object.d"
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
+   if test "$libtool" = yes; then
+      "$@" -Wc,-MD
+   else
+      "$@" -MD
+   fi
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a space and a tab in the [].
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  test -z "$dashmflag" && dashmflag=-M
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*) # this is libtool, let us make it quiet
+      for arg
+      do # cycle over the arguments
+        case "$arg" in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+makedepend)
+  # X makedepend
+  (
+    shift
+    cleared=no
+    for arg in "$@"; do
+      case $cleared in no)
+        set ""; shift
+	cleared=yes
+      esac
+      case "$arg" in
+        -D*|-I*)
+	  set fnord "$@" "$arg"; shift;;
+	-*)
+	  ;;
+	*)
+	  set fnord "$@" "$arg"; shift;;
+      esac
+    done
+    obj_suffix="`echo $object | sed 's/^.*\././'`"
+    touch "$tmpdepfile"
+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tail +3 "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+none)
+  exec "$@"
+  ;;
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+exit 0
--- a/src/data/action/symbol.cpp
+++ b/src/data/action/symbol.cpp
@@ -9,8 +9,8 @@
 #include <data/action/symbol.hpp>
 #include <data/action/symbol_part.hpp>
-DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,SymbolPartCombine>);
+DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,SymbolPartCombine>));
-DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,size_t           >);
+DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,size_t           >));
 DECLARE_TYPEOF_COLLECTION(SymbolPartP);
 DECLARE_TYPEOF_COLLECTION(ControlPointP);

--- a/src/data/card.cpp
+++ b/src/data/card.cpp
@@ -13,7 +13,7 @@
 #include <util/reflect.hpp>
 DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
 // ----------------------------------------------------------------------------- : Card

--- a/src/data/field/choice.cpp
+++ b/src/data/field/choice.cpp
@@ -10,7 +10,7 @@
 #include <util/io/package.hpp>
 DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-DECLARE_TYPEOF2(map<String,ScriptableImage>);
+DECLARE_TYPEOF((map<String,ScriptableImage>));
 // ----------------------------------------------------------------------------- : ChoiceField

--- a/src/data/format/image_to_symbol.cpp
+++ b/src/data/format/image_to_symbol.cpp
@@ -99,7 +99,7 @@ bool is_mse1_symbol(const Image& img) {
 			int r = *d++;
 			int g = *d++;
 			int b = *d++;
-			delta += abs(r - b) + abs(r - g) + abs(b - g);
+			delta += fabs(r - b) + fabs(r - g) + fabs(b - g);
 		}
 	}
 	if (delta > 5000) return false; // not black & white enough
@@ -357,7 +357,7 @@ void straighten(SymbolPart& part) {
 		Vector2D bb = next.delta_before.normalized();
 		// if the area beneath the polygon formed by the handles is small
 		// then it is a straight line
-		double cpDot = abs(aa.cross(ab)) + abs(bb.cross(ab));
+		double cpDot = fabs(aa.cross(ab)) + fabs(bb.cross(ab));
 		if (cpDot < treshold) {
 			cur.segment_after = next.segment_before = SEGMENT_LINE;
 			cur.delta_after = next.delta_before = Vector2D();

--- a/src/data/keyword.cpp
+++ b/src/data/keyword.cpp
@@ -10,7 +10,7 @@
 #include <util/tagged_string.hpp>
 class KeywordTrie;
-DECLARE_TYPEOF2(map<Char, KeywordTrie*>);
+DECLARE_TYPEOF((map<Char, KeywordTrie*>));
 // ----------------------------------------------------------------------------- : Reflection

--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -19,7 +19,7 @@
 #include <wx/sstream.h>
 DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
 // ----------------------------------------------------------------------------- : Set

--- a/src/gui/control/card_list.cpp
+++ b/src/gui/control/card_list.cpp
@@ -26,8 +26,8 @@
 DECLARE_TYPEOF_COLLECTION(CardP);
 DECLARE_TYPEOF_COLLECTION(FieldP);
 DECLARE_POINTER_TYPE(ChoiceValue);
-DECLARE_TYPEOF2(map<int,FieldP>);
+DECLARE_TYPEOF((map<int,FieldP>));
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
 // ----------------------------------------------------------------------------- : Events

--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -15,7 +15,7 @@ DECLARE_TYPEOF_COLLECTION(GraphAxisP);
 DECLARE_TYPEOF_COLLECTION(GraphElementP);
 DECLARE_TYPEOF_COLLECTION(GraphGroup);
 DECLARE_TYPEOF_COLLECTION(int);
-DECLARE_TYPEOF2(map<String,UInt>);
+DECLARE_TYPEOF((map<String,UInt>));
 // ----------------------------------------------------------------------------- : Events

--- a/src/gui/control/native_look_editor.cpp
+++ b/src/gui/control/native_look_editor.cpp
@@ -12,7 +12,7 @@
 #include <data/stylesheet.hpp>
 DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
 // ----------------------------------------------------------------------------- : NativeLookEditor

--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -24,7 +24,7 @@
 WelcomeWindow::WelcomeWindow()
 	: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,340), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
 	, logo (load_resource_image(_("about")))
-	, logo2(load_resource_image(_("two")))
+	, logo2(load_resource_image(_("two_beta")))
 {
 	SetIcon(load_resource_icon(_("app")));
@@ -120,7 +120,7 @@ END_EVENT_TABLE  ()
 // ----------------------------------------------------------------------------- : Hover button with label
 HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, const String& label, const String& sub_label)
-	: HoverButton(parent, id, _("BTN"))
+	: HoverButton(parent, id, _("btn"))
 	, icon(icon)
 	, label(label), sub_label(sub_label)
 	, font_large(14, wxSWISS, wxNORMAL, wxNORMAL, false, _("Arial"))

--- a/src/render/card/viewer.cpp
+++ b/src/render/card/viewer.cpp
@@ -18,7 +18,7 @@
 #include <gui/util.hpp> // clearDC
 DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
 // ----------------------------------------------------------------------------- : DataViewer

--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -110,7 +110,7 @@ bool_no					IMAGE	"../common/bool_no.png"
 //help_page				BITMAP	"help_page.png"
 about					IMAGE	"../common/about.png"
-two						IMAGE	"../common/two_beta.png"
+two_beta						IMAGE	"../common/two_beta.png"
 btn_normal				IMAGE	"../common/btn_normal.png"
 btn_hover				IMAGE	"../common/btn_hover.png"
 btn_focus				IMAGE	"../common/btn_focus.png"
@@ -155,7 +155,7 @@ FILETYPE VFT_APP
      VALUE "License",				"GNU General Public License 2 or later; This is free software, and you are welcome to redistribute it under certain conditions; See the help file for details"
      VALUE "FileDescription",		"Magic Set Editor"
      VALUE "InternalName",			"mse2/8"
      VALUE "LegalCopyright",		" 2001-2006 Twan van Laarhoven"
      VALUE "ProductName",			"Magic Set Editor"
    }
  }

--- a/src/script/script_manager.cpp
+++ b/src/script/script_manager.cpp
@@ -22,8 +22,8 @@ DECLARE_TYPEOF(Contexts);
 DECLARE_TYPEOF_COLLECTION(CardP);
 DECLARE_TYPEOF_COLLECTION(FieldP);
 DECLARE_TYPEOF_COLLECTION(Dependency);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
 // initialize functions, from functions.cpp
 void init_script_functions(Context& ctx);

--- a/src/util/for_each.hpp
+++ b/src/util/for_each.hpp
@@ -24,8 +24,6 @@
 	#define DECLARE_TYPEOF_NO_REV(T)
 	#define DECLARE_TYPEOF_CONST(T)
 	#define DECLARE_TYPEOF_COLLECTION(T)
-	#define DECLARE_TYPEOF2(A,B)
-	#define DECLARE_TYPEOF_NO_REV2(A,B)
 	#define TYPEOF(Value)      __typeof(Value)
 	#define TYPEOF_IT(Value)   __typeof(Value.begin())
@@ -88,21 +86,7 @@
 	/// Declare typeof magic for a specific std::vector type
 	#define DECLARE_TYPEOF_COLLECTION(T)  DECLARE_TYPEOF(vector<T>); \
-	                                      DECLARE_TYPEOF_CONST(set<T>)
+// 	                                      DECLARE_TYPEOF_CONST(set<T>)
-	/// Declare typeof magic for a specific type, with two template arguments
-	/** This is needed because the preprocessor sees MACRO(class<a,b>)
-		*  as a macro call with two arguments.
-		*/
-	#define DECLARE_TYPEOF2(A,B)										\
-		typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__);					\
-		DECLARE_TYPEOF(BOOST_PP_CAT(TypeOfTemp,__LINE__))
-	#define DECLARE_TYPEOF_NO_REV2(A,B)									\
-		typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__);					\
-		DECLARE_TYPEOF_NO_REV(BOOST_PP_CAT(TypeOfTemp,__LINE__))
-	#define DECLARE_TYPEOF_COLLECTION2(A,B)								\
-		typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__);					\
-		DECLARE_TYPEOF_COLLECTION(BOOST_PP_CAT(TypeOfTemp,__LINE__))
 #endif