diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index af2928f0b2..fc9a862b0a 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -51,6 +51,7 @@
     
     <template id="wx_util_console" template="wx_util_b">
         <app-type>console</app-type>
+        <define>wxUSE_GUI=0</define>
     </template>
     
     <template id="wx_sample" template="wx_util">
diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index d4a594598c..69b1c4e5bc 100644
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,7 +36,7 @@ DESTDIR =
 WX_RELEASE = 2.5
 LIBDIRNAME = $(top_builddir)lib
 CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 CONSOLE_OBJECTS =  \
 	console_console.o
 
@@ -104,7 +104,7 @@ clean:
 	rm -f console$(EXEEXT)
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 console$(EXEEXT): $(CONSOLE_OBJECTS)
 	$(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -115,13 +115,17 @@ console$(EXEEXT): $(CONSOLE_OBJECTS)
 data: 
 	@mkdir -p .
 	@for f in testdata.fc; do \
-	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-	cp -pRf $(srcdir)/$$f . ; \
+	if test ! -e ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
 	done
 
 console_console.o: $(srcdir)/console.cpp
-	$(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp
 
 
 # Include dependency info, if present:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 38e9ea595a..039413b37a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -40,7 +40,8 @@ WX_RELEASE = 2.5
 WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
 TEST_OBJECTS =  \
 	test_test.o \
 	test_archivetest.o \
diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in
index c14d6e0b7e..b5b3861d9f 100644
--- a/utils/HelpGen/src/Makefile.in
+++ b/utils/HelpGen/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -33,7 +33,7 @@ DESTDIR =
 WX_RELEASE = 2.5
 LIBDIRNAME = $(top_builddir)lib
 HELPGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 HELPGEN_OBJECTS =  \
 	HelpGen_HelpGen.o \
 	HelpGen_cjparser.o \
@@ -102,7 +102,7 @@ clean:
 	rm -f HelpGen$(EXEEXT)
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
 	$(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -110,28 +110,28 @@ HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
 	$(__HelpGen___mac_setfilecmd)
 
 HelpGen_HelpGen.o: $(srcdir)/HelpGen.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/HelpGen.cpp
 
 HelpGen_cjparser.o: $(srcdir)/cjparser.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/cjparser.cpp
 
 HelpGen_docripper.o: $(srcdir)/docripper.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/docripper.cpp
 
 HelpGen_ifcontext.o: $(srcdir)/ifcontext.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/ifcontext.cpp
 
 HelpGen_markup.o: $(srcdir)/markup.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/markup.cpp
 
 HelpGen_scriptbinder.o: $(srcdir)/scriptbinder.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/scriptbinder.cpp
 
 HelpGen_sourcepainter.o: $(srcdir)/sourcepainter.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/sourcepainter.cpp
 
 HelpGen_srcparser.o: $(srcdir)/srcparser.cpp
-	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(HELPGEN_CXXFLAGS) $(srcdir)/srcparser.cpp
 
 
 # Include dependency info, if present:
diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in
index 164507997a..74cb1a7ada 100644
--- a/utils/tex2rtf/src/Makefile.in
+++ b/utils/tex2rtf/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -42,7 +42,7 @@ DESTDIR =
 WX_RELEASE = 2.5
 LIBDIRNAME = $(top_builddir)lib
 TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -DNO_GUI $(CPPFLAGS) $(CXXFLAGS)
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 -DNO_GUI $(CPPFLAGS) $(CXXFLAGS)
 TEX2RTF_OBJECTS =  \
 	tex2rtf_tex2rtf.o \
 	tex2rtf_tex2any.o \
@@ -108,7 +108,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \
 	$(srcdir)/../../../samples -i $(top_srcdir)/include -o tex2rtf_gui$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
@@ -156,7 +156,7 @@ clean:
 	rm -f tex2rtf_gui$(EXEEXT)
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS)
 	$(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -178,55 +178,55 @@ install_tex2rtf:
 @COND_USE_GUI_1@	$(INSTALL_PROGRAM) tex2rtf_gui$(EXEEXT) $(DESTDIR)$(bindir)
 
 tex2rtf_tex2rtf.o: $(srcdir)/tex2rtf.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/tex2rtf.cpp
 
 tex2rtf_tex2any.o: $(srcdir)/tex2any.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/tex2any.cpp
 
 tex2rtf_texutils.o: $(srcdir)/texutils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/texutils.cpp
 
 tex2rtf_rtfutils.o: $(srcdir)/rtfutils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/rtfutils.cpp
 
 tex2rtf_xlputils.o: $(srcdir)/xlputils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/xlputils.cpp
 
 tex2rtf_htmlutil.o: $(srcdir)/htmlutil.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/htmlutil.cpp
 
 tex2rtf_readshg.o: $(srcdir)/readshg.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/readshg.cpp
 
 tex2rtf_table.o: $(srcdir)/table.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/table.cpp
 
 tex2rtf_gui_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include
+	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include
 
 tex2rtf_gui_tex2rtf.o: $(srcdir)/tex2rtf.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/tex2rtf.cpp
 
 tex2rtf_gui_tex2any.o: $(srcdir)/tex2any.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/tex2any.cpp
 
 tex2rtf_gui_texutils.o: $(srcdir)/texutils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/texutils.cpp
 
 tex2rtf_gui_rtfutils.o: $(srcdir)/rtfutils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/rtfutils.cpp
 
 tex2rtf_gui_xlputils.o: $(srcdir)/xlputils.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/xlputils.cpp
 
 tex2rtf_gui_htmlutil.o: $(srcdir)/htmlutil.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/htmlutil.cpp
 
 tex2rtf_gui_readshg.o: $(srcdir)/readshg.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/readshg.cpp
 
 tex2rtf_gui_table.o: $(srcdir)/table.cpp
-	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $(srcdir)/table.cpp
 
 
 # Include dependency info, if present:
diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 361b04a459..7efcec105e 100644
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -39,7 +39,7 @@ DESTDIR =
 WX_RELEASE = 2.5
 LIBDIRNAME = $(top_builddir)lib
 WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  \
 	wxrc_wxrc.o
 
@@ -107,7 +107,7 @@ clean:
 	rm -f wxrc$(EXEEXT)
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
 @COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -121,7 +121,7 @@ distclean: clean
 @COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
 
 wxrc_wxrc.o: $(srcdir)/wxrc.cpp
-	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp
 
 
 # Include dependency info, if present: