From ba6d76119a66c2bb426b23b5e8256b80fbf1e719 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Mon, 20 Oct 2003 23:02:49 +0000
Subject: [PATCH] removed the call to cpu_accel_print_results(); should have
 got enough

2003-10-21  Sven Neumann  <sven@gimp.org>

	* app/base/base.c (base_init): removed the call to
	cpu_accel_print_results(); should have got enough testing and
	gimp-composite outputs the same info anyway.

	* app/Makefile.am: link libappcomposite.a before libappbase.a.

	* app/config/Makefile.am (test_config_LDADD): it's not any longer
	needed to link the test against libappdisplay. and libappwidgets.a.
---
 ChangeLog                       | 11 +++++++++++
 app/Makefile.am                 |  2 +-
 app/base/base.c                 |  4 ----
 devel-docs/ChangeLog            |  7 +++++++
 devel-docs/app/Makefile.am      |  2 +-
 devel-docs/app/app-docs.sgml    |  1 +
 devel-docs/app/app-sections.txt |  6 ++++++
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97e082d357..bf792534d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-21  Sven Neumann  <sven@gimp.org>
+
+	* app/base/base.c (base_init): removed the call to
+	cpu_accel_print_results(); should have got enough testing and
+	gimp-composite outputs the same info anyway.
+
+	* app/Makefile.am: link libappcomposite.a before libappbase.a.
+
+	* app/config/Makefile.am (test_config_LDADD): it's not any longer
+	needed to link the test against libappdisplay. and libappwidgets.a.
+
 2003-10-21  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpvectorstreeview.c: implement
diff --git a/app/Makefile.am b/app/Makefile.am
index a18aea843d..9294189d7a 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -86,8 +86,8 @@ gimp_1_3_LDADD = \
 	file/libappfile.a						\
 	plug-in/libappplug-in.a						\
 	paint-funcs/libapppaint-funcs.a					\
-	base/libappbase.a						\
 	composite/libappcomposite.a					\
+	base/libappbase.a						\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la	\
 	$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la	\
 	$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la	\
diff --git a/app/base/base.c b/app/base/base.c
index 754b2658d1..d7025eae72 100644
--- a/app/base/base.c
+++ b/app/base/base.c
@@ -43,7 +43,6 @@
 #include "composite/gimp-composite.h"
 
 #include "base.h"
-#include "cpu-accel.h"
 #include "temp-buf.h"
 #include "tile-cache.h"
 #include "tile-swap.h"
@@ -80,9 +79,6 @@ base_init (GimpBaseConfig *config,
 #ifdef G_OS_WIN32
   g_printerr ("You can minimize this window, but don't close it.\n\n");
 #endif
-
-  if (use_mmx)
-    cpu_accel_print_results ();
 #endif /* odd minor version */
 
   tile_cache_init (config->tile_cache_size);
diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index d7d92a001e..d279810ecf 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-21  Sven Neumann  <sven@gimp.org>
+
+	* app/Makefile.am: fixed linker order.
+
+	* app/app-docs.sgml
+	* app/app-sections.txt: updated.
+
 2003-10-19  Sven Neumann  <sven@gimp.org>
 
 	* app/app-docs.sgml
diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am
index d5136eda90..f443565be5 100644
--- a/devel-docs/app/Makefile.am
+++ b/devel-docs/app/Makefile.am
@@ -86,8 +86,8 @@ GTKDOC_LIBS = \
         $(top_builddir)/app/file/libappfile.a				\
         $(top_builddir)/app/plug-in/libappplug-in.a			\
         $(top_builddir)/app/paint-funcs/libapppaint-funcs.a		\
-        $(top_builddir)/app/base/libappbase.a				\
         $(top_builddir)/app/composite/libappcomposite.a			\
+        $(top_builddir)/app/base/libappbase.a				\
         $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la      \
         $(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la        \
         $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la        \
diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml
index 45bfd33131..9e44d264af 100644
--- a/devel-docs/app/app-docs.sgml
+++ b/devel-docs/app/app-docs.sgml
@@ -665,6 +665,7 @@
       <xi:include href="xml/gimphistogrambox.xml"/>
       <xi:include href="xml/gimphistogramview.xml"/>
       <xi:include href="xml/gimptexteditor.xml"/>
+      <xi:include href="xml/gimptooldialog.xml"/>
       <xi:include href="xml/gimpviewablebutton.xml"/>
       <xi:include href="xml/gimpviewabledialog.xml"/>
     </chapter>
diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt
index bea5c1d918..46f4122abe 100644
--- a/devel-docs/app/app-sections.txt
+++ b/devel-docs/app/app-sections.txt
@@ -4496,6 +4496,12 @@ gimp_toolbox_color_area_create
 gimp_toolbox_indicator_area_create
 </SECTION>
 
+<SECTION>
+<FILE>gimptooldialog</FILE>
+<TITLE>GimpToolDialog</TITLE>
+gimp_tool_dialog_new
+</SECTION>
+
 <SECTION>
 <FILE>gimpundoeditor</FILE>
 <TITLE>GimpUndoEditor</TITLE>