Upgraded to libtool 1.2b

* Upgraded to libtool 1.2b * Reversioned libgimp to use gtk-style without a funky soname * configure.in: craft GLIB_CFLAGS and GLIB_LIBS * Makefile.am (pretty much all of em): changed to use new library naming scheme. Only link libgimpui and libgtk et al to the plugins that actually need them. * app/gimage_cmds.c: corrected typo that resulted in corrupt PDB record * libgimp/gimp.h * libgimp/gimpwire.h * libgimp/gimpmenu.[ch]: clean up the callback code * Removed unecessary inclusion of gtk headers for plugins that don't use em * plug-ins/zealouscrop/zealouscrop.c: use gint8 instead of gboolean, save some mem * plugged some warnings in animationplay, flame, fp, gee, gfig * gimptool.in: changes for library reversioning, added --nogimpui option for not linking in libgimpui * configure.in: added finnish translation -Yosh
1998-09-20 23:04:33 +00:00 · 1998-09-20 23:04:33 +00:00 · ab0f6afcfa
parent 9b0eb2ae01
commit ab0f6afcfa
178 changed files with 1156 additions and 1153 deletions
--- a/33
+++ b/33
@ -1,4 +1,37 @@
+Sun Sep 20 15:52:21 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* Upgraded to libtool 1.2b
+
+	* Reversioned libgimp to use gtk-style without a funky soname
+ 
+	* configure.in: craft GLIB_CFLAGS and GLIB_LIBS
+
+	* Makefile.am (pretty much all of em): changed to use new library
+	naming scheme. Only link libgimpui and libgtk et al to the plugins
+	that actually need them.
+
+	* app/gimage_cmds.c: corrected typo that resulted in corrupt PDB
+	record
+
+	* libgimp/gimp.h
+	* libgimp/gimpwire.h
+	* libgimp/gimpmenu.[ch]: clean up the callback code
+
+	* Removed unecessary inclusion of gtk headers for plugins that
+	don't use em
+
+	* plug-ins/zealouscrop/zealouscrop.c: use gint8 instead of gboolean,
+	save some mem
+
+	* plugged some warnings in animationplay, flame, fp, gee, gfig
+
+	* gimptool.in: changes for library reversioning, added --nogimpui
+	option for not linking in libgimpui
+
+	* configure.in: added finnish translation
+
 Sun Sep 20 12:57:00 CST 1998 Seth Burgess <sjburges@gimp.org>
+
 	* plug-ins/gauss_iir/gauss_iir.c: Fixed segfault if neither 
 	horizontal nor vertical was selected (as reported by Marc Lehman).

--- a/app/gimage_cmds.c
+++ b/app/gimage_cmds.c
@ -1804,7 +1804,7 @@ ProcArg gimage_merge_down_args[] =
    "The image"
  },
  { PDB_LAYER,
-    "layer"
+    "layer",
    "The layer to merge down from"
  },
  { PDB_INT32,
--- a/config.guess
+++ b/config.guess
@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -478,10 +478,10 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin32
 	exit 0 ;;
    i*:MINGW*:*)
-	echo i386-pc-mingw32
+	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
    p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin32
@ -493,6 +493,12 @@ EOF
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
    *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us.
 	ld_help_string=`ld --help 2>&1`
@ -506,6 +512,7 @@ EOF
 	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
 	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
 	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
 	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
 	esac
--- a/config.sub
+++ b/config.sub
@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@ -162,7 +162,7 @@ case $basic_machine in
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@ -171,7 +171,7 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
@ -350,19 +350,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@ -469,25 +469,23 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
--- a/configure.in
+++ b/configure.in
@ -62,13 +62,22 @@ AC_PROG_MAKE_SET
 AC_PROG_CPP

 dnl i18n stuff
-ALL_LINGUAS="sv ja it"
+ALL_LINGUAS="sv ja it fi"
 AM_GNU_GETTEXT

 dnl Check for GTK+
-AM_PATH_GTK(1.1.0,,
+AM_PATH_GTK(1.1.2,,
  AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))

+dnl Evil stuff to extract GLIB stuff from gtk-config output
+dnl (we want to make sure it matches with the gtk we're using)
+GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[[^ ]]*glib[[^ ]]*  *-I[[^ ]]*\).*$/\1/'`
+GLIB_LDFLAGS=`echo $gtk_libs | sed -e 's/^.*-lgdk[[^ ]]* *\(-L[[^ ]]*\).*$/\1/' -e 's/^.* -lgdk[[^ ]]* .*$//'`
+if test -z "$glib_ldflags" ; then
+  GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[[^ ]]*\) .*$/\1/'`
+fi 
+GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[[^ ]]*\).*$/\1/'`"
+
 if eval "test x$GCC = xyes"; then
  if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then
    CFLAGS="$CFLAGS"
@ -457,6 +466,9 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)

+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 AC_SUBST(gimpdir)
 AC_SUBST(gimpdatadir)
 AC_SUBST(gimpplugindir)
--- a/gimptool-1.2.in
+++ b/gimptool-1.2.in
@ -43,7 +43,8 @@ The --install options can be prefixed with --install-admin instead to install
 a plug-in or script in the site directory instead of a user directory.

 For plug-ins which do not use GTK+, the --build and --install options can be
-appended with -noui for appropriate settings.
+appended with -noui for appropriate settings. For plug-ins that use GTK+ but
+not libgumpui, append -nogimpui.

 All binary build and install options can be appended with -strip to discard
 debugging information.
@ -137,9 +138,9 @@ while test $# -gt 0; do
    --exec-prefix)
      echo $exec_prefix
      ;;
-    --cflags | --cflags-noui)
+    --cflags | --cflags-noui | --cflags-nogimpui)
      case $1 in
-        --cflags)
+        --cflags | --cflags-nogimpui)
          my_gtk_cflags=$gtk_cflags ;;
        --cflags-noui)
          my_gtk_cflags=`echo $gtk_cflags | sed 's/^.*\(-I[^ ]*glib[^ ]*  *-I[^ ]*\).*$/\1/'` ;;
@ -154,7 +155,7 @@ while test $# -gt 0; do
      fi
      echo $includes $my_gtk_cflags
      ;;
-    --libs)
+    --libs | --libs-nogimpui)
      my_gtk_libs=
      libdirs=-L@libdir@
      for i in $gtk_libs ; do
@ -166,7 +167,12 @@ while test $# -gt 0; do
          fi
        fi
      done
-      echo $libdirs -lgimpui-@LT_RELEASE@ -lgimp-@LT_RELEASE@ $my_gtk_libs
+      case $1 in
+        --libs)
+          echo $libdirs -lgimpui -lgimp $my_gtk_libs ;;
+        --libs-nogimpui)
+          echo $libdirs -lgimp $my_gtk_libs ;;
+      esac
      ;;
    --libs-noui)
      glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
@ -185,7 +191,7 @@ while test $# -gt 0; do
          fi
        fi
      done
-      echo -L@libdir@ -lgimp-@LT_RELEASE@ $my_glib_libs
+      echo -L@libdir@ -lgimp $my_glib_libs
      ;;
    --install-bin | --install-admin-bin \
    | --install-bin-strip | --install-admin-bin-strip \
@ -231,8 +237,10 @@ while test $# -gt 0; do
        exit 1
      fi
      ;;
-    --build | --install | --install-admin \
-    | --build-strip | --install-strip | --install-admin-strip \
+    --build | --install | --install-admin | --build-strip | --install-strip \
+    | --install-admin-strip | --build-nogimpui | --install-nogimpui \
+    | --install-admin-nogimpui | --build-nogimpui-strip \
+    | --install-nogimpui-strip | --install-admin-nogimpui-strip \
    | --build-noui | --install-noui | --install-admin-noui \
    | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
      opt=`echo $1 | sed 's/-strip$//'`
@ -240,17 +248,21 @@ while test $# -gt 0; do
        cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`
      fi
      case $opt in
-        --build | --build-noui)
+        --build | --build-noui | --build-nogimpui)
          install_dir=. ;;
-        --install | --install-noui)
+        --install | --install-noui | --install-nogimpui)
          install_dir="$HOME/@gimpdir@/plug-ins" ;;
-        --install-admin | --install-admin-noui)
+        --install-admin | --install-admin-noui | --install-admin-nogimpui)
          install_dir="$plug_in_dir/plug-ins" ;;
      esac
      noui=`echo $opt | sed 's/^.*\(noui\)$/\1/'`
+      nogimpui=`echo $opt | sed 's/^.*\(nogimpui\)$/\1/'`
      if test "$noui" = "noui" ; then
        gimp_cflags=`$0 --cflags-noui`
        gimp_libs=`$0 --libs-noui`
+      elif test "$nogimpui" = "nogimpui" ; then
+        gimp_cflags=`$0 --cflags-nogimpui`
+        gimp_libs=`$0 --libs-nogimpui`
      else
        gimp_cflags=`$0 --cflags`
        gimp_libs=`$0 --libs`
--- a/gimptool.in
+++ b/gimptool.in
@ -43,7 +43,8 @@ The --install options can be prefixed with --install-admin instead to install
 a plug-in or script in the site directory instead of a user directory.

 For plug-ins which do not use GTK+, the --build and --install options can be
-appended with -noui for appropriate settings.
+appended with -noui for appropriate settings. For plug-ins that use GTK+ but
+not libgumpui, append -nogimpui.

 All binary build and install options can be appended with -strip to discard
 debugging information.
@ -137,9 +138,9 @@ while test $# -gt 0; do
    --exec-prefix)
      echo $exec_prefix
      ;;
-    --cflags | --cflags-noui)
+    --cflags | --cflags-noui | --cflags-nogimpui)
      case $1 in
-        --cflags)
+        --cflags | --cflags-nogimpui)
          my_gtk_cflags=$gtk_cflags ;;
        --cflags-noui)
          my_gtk_cflags=`echo $gtk_cflags | sed 's/^.*\(-I[^ ]*glib[^ ]*  *-I[^ ]*\).*$/\1/'` ;;
@ -154,7 +155,7 @@ while test $# -gt 0; do
      fi
      echo $includes $my_gtk_cflags
      ;;
-    --libs)
+    --libs | --libs-nogimpui)
      my_gtk_libs=
      libdirs=-L@libdir@
      for i in $gtk_libs ; do
@ -166,7 +167,12 @@ while test $# -gt 0; do
          fi
        fi
      done
-      echo $libdirs -lgimpui-@LT_RELEASE@ -lgimp-@LT_RELEASE@ $my_gtk_libs
+      case $1 in
+        --libs)
+          echo $libdirs -lgimpui -lgimp $my_gtk_libs ;;
+        --libs-nogimpui)
+          echo $libdirs -lgimp $my_gtk_libs ;;
+      esac
      ;;
    --libs-noui)
      glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
@ -185,7 +191,7 @@ while test $# -gt 0; do
          fi
        fi
      done
-      echo -L@libdir@ -lgimp-@LT_RELEASE@ $my_glib_libs
+      echo -L@libdir@ -lgimp $my_glib_libs
      ;;
    --install-bin | --install-admin-bin \
    | --install-bin-strip | --install-admin-bin-strip \
@ -231,8 +237,10 @@ while test $# -gt 0; do
        exit 1
      fi
      ;;
-    --build | --install | --install-admin \
-    | --build-strip | --install-strip | --install-admin-strip \
+    --build | --install | --install-admin | --build-strip | --install-strip \
+    | --install-admin-strip | --build-nogimpui | --install-nogimpui \
+    | --install-admin-nogimpui | --build-nogimpui-strip \
+    | --install-nogimpui-strip | --install-admin-nogimpui-strip \
    | --build-noui | --install-noui | --install-admin-noui \
    | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip)
      opt=`echo $1 | sed 's/-strip$//'`
@ -240,17 +248,21 @@ while test $# -gt 0; do
        cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'`
      fi
      case $opt in
-        --build | --build-noui)
+        --build | --build-noui | --build-nogimpui)
          install_dir=. ;;
-        --install | --install-noui)
+        --install | --install-noui | --install-nogimpui)
          install_dir="$HOME/@gimpdir@/plug-ins" ;;
-        --install-admin | --install-admin-noui)
+        --install-admin | --install-admin-noui | --install-admin-nogimpui)
          install_dir="$plug_in_dir/plug-ins" ;;
      esac
      noui=`echo $opt | sed 's/^.*\(noui\)$/\1/'`
+      nogimpui=`echo $opt | sed 's/^.*\(nogimpui\)$/\1/'`
      if test "$noui" = "noui" ; then
        gimp_cflags=`$0 --cflags-noui`
        gimp_libs=`$0 --libs-noui`
+      elif test "$nogimpui" = "nogimpui" ; then
+        gimp_cflags=`$0 --cflags-nogimpui`
+        gimp_libs=`$0 --libs-nogimpui`
      else
        gimp_cflags=`$0 --cflags`
        gimp_libs=`$0 --libs`
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@ -6,7 +6,7 @@ scriptdata =

 EXTRA_DIST = gimpfeatures.h.in

-lib_LTLIBRARIES = libgimp-1.1.la libgimpui-1.1.la
+lib_LTLIBRARIES = libgimp.la libgimpui.la
 noinst_LIBRARIES = libgimpi.a

 libgimpi_a_SOURCES = \
@ -16,9 +16,9 @@ libgimpi_a_SOURCES = \
 	gimpwire.h

 ## Evil hack to insure all deps are satisfied on first-run make
-libgimpi_a_DEPENDENCIES = libgimp-1.1.la
+libgimpi_a_DEPENDENCIES = libgimp.la

-libgimp_1_1_la_SOURCES = \
+libgimp_la_SOURCES = \
 	gimp.c		\
 	gimpchannel.c	\
 	gimpdisplay.c	\
@ -34,7 +34,7 @@ libgimp_1_1_la_SOURCES = \
 	gimpwire.c	\
 	gimpwire.h

-libgimpui_1_1_la_SOURCES = \
+libgimpui_la_SOURCES = \
 	gimpmenu.c

 gimpinclude_HEADERS = \
@ -45,8 +45,10 @@ gimpinclude_HEADERS = \
 	gimpui.h	\
 	gimpintl.h

-libgimp_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libgimpui_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libgimp_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libgimpui_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)

 CPPFLAGS = \
 	-DGIMPDIR=\""$(gimpdir)"\"
@ -58,12 +60,6 @@ INCLUDES = \
 	$(GTK_CFLAGS)		\
 	-I$(includedir)

-libgimpui_1_1_la_INCLUDES = \
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/intl	\
-	$(GTK_CFLAGS)		\
-	-I$(includedir)
-
 .PHONY: files

 files:
--- a/libgimp/gimp.h
+++ b/libgimp/gimp.h
@ -345,19 +345,6 @@ guchar*  gimp_color_cube   (void);
 gchar*   gimp_gtkrc        (void);


-/* Popup the brush dialog interactively */
-typedef void (* GRunBrushCallback) (gchar *, /* Name */
-				    gdouble, /* opacity */
-				    gint,    /* spacing */
-				    gint,    /* paint_mode */
-				    gint,    /* width */
-				    gint,    /* height */
-				    gchar *, /* mask data */
-				    gint     /* dialog closing */);
-
-void 
-gimp_interactive_selection_brush(gchar *dialogname, gchar *brush_name,GRunBrushCallback callback);
-
 /****************************************
 *              Images                  *
 ****************************************/
--- a/libgimp/gimpmenu.c
+++ b/libgimp/gimpmenu.c
@ -23,9 +23,43 @@
 #include "gimpui.h"


-static char* gimp_base_name     (char *str);
-static void  gimp_menu_callback (GtkWidget *w,
-				 gint32    *id);
+/* Copy data from temp_PDB call */
+struct _GBrushData {
+  gint busy;
+  gchar *bname;
+  gdouble opacity;
+  gint spacing;
+  gint paint_mode;
+  gint width;
+  gint height;
+  gchar *brush_mask_data;
+  GRunBrushCallback callback;
+  gint closing;
+};
+
+typedef struct _GBrushData GBrushData;
+
+
+static void    gimp_menu_callback    (GtkWidget        *w,
+				      gint32           *id);
+static void    do_brush_callback     (GBrushData       *bdata);
+static gint    idle_test             (GBrushData       *bdata);
+static void    temp_brush_invoker    (char             *name,
+				      int               nparams,
+				      GParam           *param,
+				      int              *nreturn_vals,
+				      GParam          **return_vals);
+static void    input_callback        (gpointer          data,
+				      gint              source,
+				      GdkInputCondition condition);
+static void    gimp_setup_callbacks  (void);
+static gchar*  gen_temp_plugin_name  (void);
+
+/* From gimp.c */
+void gimp_run_temp (void);
+
+static GHashTable *gbrush_ht = NULL;
+static GBrushData *active_brush_pdb = NULL;


 GtkWidget*
@ -52,7 +86,7 @@ gimp_image_menu_new (GimpConstraintFunc constraint,
      {
 	filename = gimp_image_get_filename (images[i]);
 	label = g_new (char, strlen (filename) + 16);
-	sprintf (label, "%s-%d", gimp_base_name (filename), images[i]);
+	sprintf (label, "%s-%d", g_basename (filename), images[i]);
 	g_free (filename);

 	menuitem = gtk_menu_item_new_with_label (label);
@ -118,7 +152,7 @@ gimp_layer_menu_new (GimpConstraintFunc constraint,
      {
 	name = gimp_image_get_filename (images[i]);
 	image_label = g_new (char, strlen (name) + 16);
-	sprintf (image_label, "%s-%d", gimp_base_name (name), images[i]);
+	sprintf (image_label, "%s-%d", g_basename (name), images[i]);
 	g_free (name);

 	layers = gimp_image_get_layers (images[i], &nlayers);
@ -198,7 +232,7 @@ gimp_channel_menu_new (GimpConstraintFunc constraint,
      {
 	name = gimp_image_get_filename (images[i]);
 	image_label = g_new (char, strlen (name) + 16);
-	sprintf (image_label, "%s-%d", gimp_base_name (name), images[i]);
+	sprintf (image_label, "%s-%d", g_basename (name), images[i]);
 	g_free (name);

 	channels = gimp_image_get_channels (images[i], &nchannels);
@ -280,7 +314,7 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint,
      {
 	name = gimp_image_get_filename (images[i]);
 	image_label = g_new (char, strlen (name) + 16);
-	sprintf (image_label, "%s-%d", gimp_base_name (name), images[i]);
+	sprintf (image_label, "%s-%d", g_basename (name), images[i]);
 	g_free (name);

 	layers = gimp_image_get_layers (images[i], &nlayers);
@ -360,17 +394,6 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint,
 }


-static char*
-gimp_base_name (char *str)
-{
-  char *t;
-
-  t = strrchr (str, '/');
-  if (!t)
-    return str;
-  return t+1;
-}
-
 static void
 gimp_menu_callback (GtkWidget *w,
 		    gint32    *id)
@ -394,27 +417,8 @@ gimp_menu_callback (GtkWidget *w,
 * we will restrict this to a temp PDB function we have registered.
 */

-/* Copy data from temp_PDB call */
-struct _GBrush_data {
-  gint busy;
-  gchar * bname;
-  gdouble opacity;
-  gint spacing;
-  gint paint_mode;
-  gint width;
-  gint height;
-  gchar * brush_mask_data;
-  GRunBrushCallback callback;
-  gint closing;
-};
-
-typedef struct _GBrush_data GBrush_data;
-
-static GHashTable * gbrush_ht = NULL;
-static GBrush_data * active_brush_pdb = NULL;
-
 static void 
-do_brush_callback(GBrush_data * bdata)
+do_brush_callback(GBrushData * bdata)
 {
  if(!bdata->busy)
    return;
@ -440,10 +444,9 @@ do_brush_callback(GBrush_data * bdata)
 }

 static gint
-idle_test (GBrush_data * bd)
+idle_test (GBrushData * bdata)
 {
-  do_brush_callback(bd);
-
+  do_brush_callback(bdata);
  return FALSE;
 }

@ -457,7 +460,7 @@ temp_brush_invoker(char    *name,
 {
  static GParam values[1];
  GStatusType status = STATUS_SUCCESS;
-  GBrush_data *bdata = (GBrush_data *)g_hash_table_lookup(gbrush_ht,name);
+  GBrushData *bdata = (GBrushData *)g_hash_table_lookup(gbrush_ht,name);

  if(!bdata)
    {
@ -501,20 +504,18 @@ temp_brush_invoker(char    *name,
  values[0].data.d_status = status;
 }

-extern void gimp_run_temp(); /* gimp.c */
-
-void input_callback( gpointer          data,
-                     gint              source,
-                     GdkInputCondition condition )
+static void
+input_callback (gpointer          data,
+                gint              source,
+                GdkInputCondition condition)
 {
  /* We have some data in the wire - read it */
  /* The below will only ever run a single proc */
  gimp_run_temp();
-
 }

 static void
-gimp_setup_callbacks()
+gimp_setup_callbacks (void)
 {
  static int first_time = TRUE;
  extern int _readfd;
@ -528,7 +529,7 @@ gimp_setup_callbacks()
 }

 static gchar *
-gen_temp_plugin_name()
+gen_temp_plugin_name (void)
 {
  GParam *return_vals;
  int nreturn_vals;
@ -572,7 +573,7 @@ gimp_interactive_selection_brush(gchar *dialogname, gchar *brush_name,GRunBrushC
  gint bnreturn_vals;
  GParam *pdbreturn_vals;
  gchar *pdbname = gen_temp_plugin_name();
-  GBrush_data *bdata = g_malloc0(sizeof(struct _GBrush_data));
+  GBrushData *bdata = g_malloc0(sizeof(struct _GBrushData));

  gimp_install_temp_proc (pdbname,
 			  "Temp PDB for interactive popups",
@ -618,7 +619,4 @@ gimp_interactive_selection_brush(gchar *dialogname, gchar *brush_name,GRunBrushC

  bdata->callback = callback;
  g_hash_table_insert(gbrush_ht,pdbname,bdata);
-
 }
-
-
--- a/libgimp/gimpmenu.h
+++ b/libgimp/gimpmenu.h
@ -34,6 +34,16 @@ typedef gint (*GimpConstraintFunc) (gint32   image_id,
 typedef void (*GimpMenuCallback)   (gint32   id,
 				    gpointer data);

+/* Popup the brush dialog interactively */
+typedef void (* GRunBrushCallback) (gchar *, /* Name */
+                                    gdouble, /* opacity */
+                                    gint,    /* spacing */
+                                    gint,    /* paint_mode */
+                                    gint,    /* width */
+                                    gint,    /* height */
+                                    gchar *, /* mask data */
+                                    gint     /* dialog closing */);
+
 GtkWidget* gimp_image_menu_new    (GimpConstraintFunc constraint,
 				   GimpMenuCallback   callback,
 				   gpointer           data,
@ -51,6 +61,9 @@ GtkWidget* gimp_drawable_menu_new (GimpConstraintFunc constraint,
 				   gpointer           data,
 				   gint32             active_drawable);

+void gimp_interactive_selection_brush (gchar *dialogname,
+				       gchar *brush_name,
+				       GRunBrushCallback callback);

 #ifdef __cplusplus
 }
--- a/libgimp/gimpwire.h
+++ b/libgimp/gimpwire.h
@ -91,5 +91,4 @@ int  wire_write_string (int              fd,
 			gchar          **data,
 			gint             count);

-
 #endif /* __GIMP_WIRE_H__ */
--- a/libgimpbase/gimpwire.h
+++ b/libgimpbase/gimpwire.h
@ -91,5 +91,4 @@ int  wire_write_string (int              fd,
 			gchar          **data,
 			gint             count);

-
 #endif /* __GIMP_WIRE_H__ */
--- a/289
+++ b/289
@ -25,13 +25,25 @@

 # A lot of this script is taken from autoconf-2.10.

+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+echo=echo
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi

-echo=echo
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
-else
+if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
  # The Solaris, AIX, and Digital Unix default echo programs unquote
  # backslashes.  This makes it impossible to quote backslashes using
  #   echo "$something" | sed 's/\\/\\\\/g'
@ -51,20 +63,15 @@ else
    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then
      # This shell has a builtin print -r that does the trick.
      echo='print -r'
-#
-# The following is from libtool-1.2a, won't work with this patched
-# libtool-1.2
-#
-#    elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
-#      # If we have ksh, try running ltconfig again with it.
-#      CONFIG_SHELL=/bin/ksh
-#      export CONFIG_SHELL
-#      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+    elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running ltconfig again with it.
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
    else
      # Try using printf.
      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
-      else
+      if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then
        # Oops.  We lost completely, so just stick with echo.
        echo=echo
      fi
@ -86,7 +93,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
 # Constants:
 PROGRAM=ltconfig
 PACKAGE=libtool
-VERSION=1.2
+VERSION=1.2b
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
 rm="rm -f"
@ -94,6 +101,7 @@ rm="rm -f"
 help="Try \`$progname --help' for more information."

 # Global variables:
+default_ofile=libtool
 can_build_shared=yes
 enable_shared=yes
 # All known linkers require a `.a' archive for static linking.
@ -105,6 +113,7 @@ ac_config_guess=
 ac_config_sub=
 host=
 nonopt=
+ofile="$default_ofile"
 verify_host=yes
 with_gcc=no
 with_gnu_ld=no
@ -141,10 +150,12 @@ Usage: $progname [OPTION]... LTMAIN [HOST]

 Generate a system-specific libtool script.

+    --debug                enable verbose shell tracing
    --disable-shared       do not build shared libraries
    --disable-static       do not build static libraries
    --help                 display this help and exit
    --no-verify            do not verify that HOST is a valid host type
+-o, --output=FILE          specify the output file [default=$default_ofile]
    --quiet                same as \`--silent'
    --silent               do not print informational messages
    --srcdir=DIR           find \`config.guess' in DIR
@ -160,6 +171,11 @@ EOM
  exit 0
  ;;

+  --debug)
+    echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
  --disable-shared) enable_shared=no ;;

  --disable-static) enable_static=no ;;
@ -171,6 +187,9 @@ EOM

  --no-verify) verify_host=no ;;

+  --output | -o) prev=ofile ;;
+  --output=*) ofile="$optarg" ;;
+
  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;

  --with-gcc) with_gcc=yes ;;
@ -205,8 +224,7 @@ if test -z "$ltmain"; then
  exit 1
 fi

-if test -f "$ltmain"; then :
-else
+if test ! -f "$ltmain"; then
  echo "$progname: \`$ltmain' does not exist" 1>&2
  echo "$help" 1>&2
  exit 1
@ -284,7 +302,7 @@ if test "$verify_host" = yes; then
  ac_config_sub=$ac_aux_dir/config.sub

  # Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
+  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
  else
    echo "$progname: cannot run $ac_config_sub" 1>&2
    echo "$help" 1>&2
@ -296,14 +314,14 @@ if test "$verify_host" = yes; then
  host_alias=$host
  case "$host_alias" in
  "")
-    if host_alias=`$ac_config_guess`; then :
+    if host_alias=`$SHELL $ac_config_guess`; then :
    else
      echo "$progname: cannot guess host type; you must specify one" 1>&2
      echo "$help" 1>&2
      exit 1
    fi ;;
  esac
-  host=`$ac_config_sub $host_alias`
+  host=`$SHELL $ac_config_sub $host_alias`
  echo "$ac_t$host" 1>&6

  # Make sure the host verified.
@ -441,7 +459,7 @@ if test "$with_gcc" != yes || test -z "$CC"; then
  # Now see if the compiler is really GCC.
  with_gcc=no
  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:444: checking whether we are using GNU C" >&5
+  echo "$progname:462: checking whether we are using GNU C" >&5

  $rm conftest.c
  cat > conftest.c <<EOF
@ -449,7 +467,7 @@ if test "$with_gcc" != yes || test -z "$CC"; then
  yes;
 #endif
 EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    with_gcc=yes
  fi
  $rm conftest.c
@ -497,7 +515,7 @@ else
    link_static_flag='-bnso -bI:/lib/syscalls.exp'
    ;;

-  hpux9* | hpux10*)
+  hpux9* | hpux10* | hpux11*)
    # Is there a better link_static_flag that works with the bundled CC?
    wl='-Wl,'
    link_static_flag="${wl}-a ${wl}archive"
@ -564,8 +582,8 @@ if test -n "$pic_flag"; then
  echo "int some_variable = 0;" > conftest.c
  save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:567: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
+  echo "$progname:585: checking if $compiler PIC flag $pic_flag works" >&5
+  if { (eval echo $progname:586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
    # Append any warnings to the config.log.
    cat conftest.err 1>&5

@ -608,8 +626,8 @@ $rm conftest*
 echo 'main(){return(0);}' > conftest.c
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:611: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+echo "$progname:629: checking if $compiler static flag $link_static_flag works" >&5
+if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  echo "$ac_t$link_static_flag" 1>&6
 else
  echo "$ac_t"none 1>&6
@ -641,11 +659,11 @@ if test -z "$LD"; then
  if test "$with_gcc" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:644: checking for ld used by GCC" >&5
+    echo "$progname:662: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
    # Accept absolute paths.
-    /* | [A-Za-z]:\\*)
+    /* | [A-Za-z]:[/\\]*)
      test -z "$LD" && LD="$ac_prog"
      ;;
    "")
@ -659,10 +677,10 @@ if test -z "$LD"; then
    esac
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:662: checking for GNU ld" >&5
+    echo "$progname:680: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:665: checking for non-GNU ld" >&5
+    echo "$progname:683: checking for non-GNU ld" >&5
  fi

  if test -z "$LD"; then
@ -714,6 +732,7 @@ no_undefined_flag=
 archive_cmds=
 old_archive_from_new_cmds=
 export_dynamic_flag_spec=
+whole_archive_flag_spec=
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
@ -721,31 +740,42 @@ hardcode_minus_L=no
 hardcode_shlibpath_var=unsupported
 runpath_var=

-case "$host_os" in
-amigaos* | sunos4*)
-  # On these operating systems, we should treat GNU ld like the system ld.
-  gnu_ld_acts_native=yes
-  ;;
-*)
-  gnu_ld_acts_native=no
-  ;;
-esac
-
 ld_shlibs=yes
-if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+if test "$with_gnu_ld" = yes; then

  # See if GNU ld supports shared libraries.
-  if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-    archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
-    runpath_var=LD_RUN_PATH
-    ld_shlibs=yes
-  else
-    ld_shlibs=no
-  fi
+  case "$host_os" in
+  amigaos*)
+    archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    ;;
+
+  sunos4*)
+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  linux-gnu*)
+    archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs'
+    ;;
+
+  *)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+  esac

  if test "$ld_shlibs" = yes; then
+    runpath_var=LD_RUN_PATH
    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
    export_dynamic_flag_spec='${wl}--export-dynamic'
+    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  fi
 else
  # PORTME fill in a description of your system's linker (not GNU ld)
@ -801,7 +831,7 @@ else
    archive_cmds='$CC -shared -o $lib$libobjs'
    hardcode_libdir_flag_spec='-R$libdir'
    hardcode_direct=yes
-    hardcode_minus_L=yes
+    hardcode_minus_L=no
    hardcode_shlibpath_var=no
    ;;

@ -813,7 +843,7 @@ else
    export_dynamic_flag_spec='${wl}-E'
    ;;

-  hpux10*)
+  hpux10* | hpux11*)
    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
    hardcode_direct=yes
@ -822,7 +852,11 @@ else
    ;;

  irix5* | irix6*)
-    archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
+    if test "$with_gcc" = yes; then
+      archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs'
+    else
+      archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
+    fi
    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
    ;;

@ -876,15 +910,7 @@ else
    ;;

  sunos4*)
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared -o $lib$libobjs'
-    else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
-    fi
-
-    if test "$with_gnu_ld" = yes; then
-      export_dynamic_flag_spec='${wl}-export-dynamic'
-    fi
+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
    hardcode_libdir_flag_spec='-L$libdir'
    hardcode_direct=yes
    hardcode_minus_L=yes
@ -910,7 +936,7 @@ echo "$ac_t$ld_shlibs" 1>&6
 if test -z "$NM"; then
  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
  case "$NM" in
-  /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path.
+  /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path.
  *)
    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
@ -988,11 +1014,11 @@ void nm_test_func(){}
 main(){nm_test_var='a';nm_test_func();return(0);}
 EOF

-echo "$progname:991: checking if global_symbol_pipe works" >&5
-if { (eval echo $progname:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
+echo "$progname:1013: checking if global_symbol_pipe works" >&5
+if { (eval echo $progname:1014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
  # Now try to grab the symbols.
  nlist=conftest.nm
-  if { echo "$progname:995: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+  if { echo "$progname:1017: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then

    # Try sorting and uniquifying the output.
    if sort "$nlist" | uniq > "$nlist"T; then
@ -1050,7 +1076,7 @@ EOF
 	save_CFLAGS="$CFLAGS"
        LIBS='conftestm.o'
 	CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo $progname:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+        if { (eval echo $progname:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
          pipe_works=yes
        else
          echo "$progname: failed program was:" >&5
@ -1093,25 +1119,20 @@ if test -n "$hardcode_libdir_flag_spec" || \
    # We can link without hardcoding, and we can hardcode nonexisting dirs.
    hardcode_action=immediate
  fi
-elif test "$hardcode_direct" != yes && \
-     test "$hardcode_minus_L" != yes && \
-     test "$hardcode_shlibpath_var" != yes; then
-  # We cannot hardcode anything.
-  hardcode_action=unsupported
 else
-  # We can only hardcode existing directories.
-  hardcode_action=relink
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
 fi
 echo "$ac_t$hardcode_action" 1>&6
-test "$hardcode_action" = unsupported && can_build_shared=no


 reload_flag=
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linker may need a different reload flag.
+# PORTME Some linkers may need a different reload flag.
 reload_flag='-r'
-echo "$ac_t$reload_flag"
+echo "$ac_t$reload_flag" 1>&6
 test -n "$reload_flag" && reload_flag=" $reload_flag"

 # PORTME Fill in your ld.so characteristics
@ -1130,11 +1151,11 @@ echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
 case "$host_os" in
 aix3* | aix4*)
  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix $libname.a'
+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
  shlibpath_var=LIBPATH

  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so.$major'
+  soname_spec='${libname}${release}.so$major'
  ;;

 amigaos*)
@ -1145,25 +1166,25 @@ amigaos*)

 freebsd2* | freebsd3*)
  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

 gnu*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

-hpux9* | hpux10*)
+hpux9* | hpux10* | hpux11*)
  # Give a soname corresponding to the major version so that dld.sl refuses to
  # link against other versions.
  dynamic_linker="$host_os dld.sl"
  version_type=sunos
  shlibpath_var=SHLIB_PATH
-  library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl'
-  soname_spec='${libname}${release}.sl.$major'
+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+  soname_spec='${libname}${release}.sl$major'
  # HP-UX runs *really* slowly unless shared libraries are mode 555.
  postinstall_cmds='chmod 555 $lib'
  ;;
@ -1171,7 +1192,7 @@ hpux9* | hpux10*)
 irix5* | irix6*)
  version_type=osf
  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

@ -1183,9 +1204,9 @@ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
 # This must be Linux ELF.
 linux-gnu*)
  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
  shlibpath_var=LD_LIBRARY_PATH

  if test -f /lib/ld.so.1; then
@ -1201,8 +1222,8 @@ linux-gnu*)

 netbsd* | openbsd*)
  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+  library_names_spec='${libname}${release}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

@ -1216,42 +1237,44 @@ os2*)
 osf3* | osf4*)
  version_type=osf
  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

 sco3.2v5*)
  version_type=osf
-  soname_spec='${libname}${release}.so.$major'
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

 solaris2*)
  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
  shlibpath_var=LD_LIBRARY_PATH
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
  ;;

 sunos4*)
  version_type=sunos
-  library_names_spec='${libname}${release}.so.$versuffix'
-  finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
+  library_names_spec='${libname}${release}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

 sysv4.2uw2*)
  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

 uts4*)
  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
  shlibpath_var=LD_LIBRARY_PATH
  ;;

@ -1307,7 +1330,7 @@ ltecho="$echo"
 for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
  old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
  link_static_flag no_builtin_flag export_dynamic_flag_spec \
-  libname_spec library_names_spec soname_spec RANLIB \
+  whole_archive_flag_spec libname_spec library_names_spec soname_spec RANLIB \
  old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
  old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
  allow_undefined_flag no_undefined_flag \
@ -1327,14 +1350,13 @@ for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
  esac
 done

-ofile=libtool
-trap "$rm $ofile; exit 1" 1 2 15
-echo creating $ofile
-$rm $ofile
-cat <<EOF > $ofile
-#! /bin/sh
+trap "$rm \"$ofile\"; exit 1" 1 2 15
+echo "creating $ofile"
+$rm "$ofile"
+cat <<EOF > "$ofile"
+#! $SHELL

-# libtool - Provide generalized library-building support services.
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
 # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
 #
@ -1360,8 +1382,15 @@ cat <<EOF > $ofile
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# This program was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+### BEGIN LIBTOOL CONFIG
+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
 # CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
 # LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
@ -1370,32 +1399,25 @@ cat <<EOF > $ofile
 # Compiler and other test output produced by $progname, useful for
 # debugging $progname, is in ./config.log if it exists.

-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-
-# An echo program that does not interpret backslashes.
-echo="$ltecho"
-
 # The version of $progname that generated this script.
 LTCONFIG_VERSION="$VERSION"

 # Shell to use when invoking shell scripts.
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL="$SHELL"

-# Whether or not to build libtool libraries.
+# Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared

-# Whether or not to build old-style libraries.
+# Whether or not to build static libraries.
 build_old_libs=$enable_static

 # The host system.
 host_alias="$host_alias"
 host="$host"

+# An echo program that does not interpret backslashes.
+echo="$ltecho"
+
 # The archiver.
 AR="$AR"

@ -1433,6 +1455,9 @@ no_builtin_flag="$no_builtin_flag"
 # Compiler flag to allow reflexive dlopens.
 export_dynamic_flag_spec="$export_dynamic_flag_spec"

+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="$whole_archive_flag_spec"
+
 # Library versioning type.
 version_type=$version_type

@ -1502,12 +1527,12 @@ hardcode_minus_L=$hardcode_minus_L
 # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 # the resulting binary.
 hardcode_shlibpath_var=$hardcode_shlibpath_var
-
 EOF

 case "$host_os" in
 aix3*)
-  cat <<\EOF >> $ofile
+  cat <<\EOF >> "$ofile"
+
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
@ -1515,15 +1540,17 @@ if test "${COLLECT_NAMES+set}" != set; then
  COLLECT_NAMES=
  export COLLECT_NAMES
 fi
-
 EOF
  ;;
 esac

-# Append the ltmain.sh script.
-cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
+echo '### END LIBTOOL CONFIG' >> "$ofile"
+echo >> "$ofile"

-chmod +x $ofile
+# Append the ltmain.sh script.
+cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
+
+chmod +x "$ofile"
 exit 0

 # Local Variables:
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/plug-ins/AlienMap/Makefile.am
+++ b/plug-ins/AlienMap/Makefile.am
@ -14,13 +14,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 AlienMap_DEPENDENCIES = $(DEPS)

--- a/plug-ins/CEL/Makefile.am
+++ b/plug-ins/CEL/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 CEL_DEPENDENCIES = $(DEPS)

--- a/plug-ins/CML_explorer/Makefile.am
+++ b/plug-ins/CML_explorer/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 CML_explorer_DEPENDENCIES = $(DEPS)

--- a/plug-ins/Lighting/Makefile.am
+++ b/plug-ins/Lighting/Makefile.am
@ -36,15 +36,15 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la		\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la			\
-	$(top_builddir)/plug-ins/libgck/gck/libgck-@LT_RELEASE@.la	\
+	$(top_builddir)/libgimp/libgimpui.la		\
+	$(top_builddir)/libgimp/libgimp.la		\
+	$(top_builddir)/plug-ins/libgck/gck/libgck.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/libgck/gck/libgck-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimpui.la		\
+	$(top_builddir)/libgimp/libgimp.la		\
+	$(top_builddir)/plug-ins/libgck/gck/libgck.la
 	
 Lighting_DEPENDENCIES = $(DEPS)

--- a/plug-ins/MapObject/Makefile.am
+++ b/plug-ins/MapObject/Makefile.am
@ -38,15 +38,15 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la		\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la			\
-	$(top_builddir)/plug-ins/libgck/gck/libgck-@LT_RELEASE@.la	\
+	$(top_builddir)/libgimp/libgimpui.la		\
+	$(top_builddir)/libgimp/libgimp.la		\
+	$(top_builddir)/plug-ins/libgck/gck/libgck.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/libgck/gck/libgck-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimpui.la		\
+	$(top_builddir)/libgimp/libgimp.la		\
+	$(top_builddir)/plug-ins/libgck/gck/libgck.la
 	
 MapObject_DEPENDENCIES = $(DEPS)

--- a/plug-ins/aa/Makefile.am
+++ b/plug-ins/aa/Makefile.am
@ -13,14 +13,12 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)						\
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GTK_LIBS)				\
 	@LIBAA_LIB@

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 aa_DEPENDENCIES = $(DEPS)

--- a/plug-ins/align_layers/Makefile.am
+++ b/plug-ins/align_layers/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 align_layers_DEPENDENCIES = $(DEPS)

--- a/plug-ins/animationplay/Makefile.am
+++ b/plug-ins/animationplay/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 animationplay_DEPENDENCIES = $(DEPS)

--- a/plug-ins/animationplay/animationplay.c
+++ b/plug-ins/animationplay/animationplay.c
@ -615,9 +615,12 @@ build_dialog(GImageType basetype,
  GtkWidget* hbox;
  GtkWidget* hbox2;
  GtkWidget* eventbox;
-  guchar* color_cube;
  GdkCursor* cursor;

+#ifndef RAPH_IS_HOME
+  guchar* color_cube;
+#endif
+
  argc = 1;
  argv = g_new (gchar *, 1);
  argv[0] = g_strdup ("animationplay");
--- a/plug-ins/animoptimize/Makefile.am
+++ b/plug-ins/animoptimize/Makefile.am
@ -9,17 +9,15 @@ animoptimize_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 animoptimize_DEPENDENCIES = $(DEPS)

--- a/plug-ins/apply_lens/Makefile.am
+++ b/plug-ins/apply_lens/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 apply_lens_DEPENDENCIES = $(DEPS)

--- a/plug-ins/autocrop/Makefile.am
+++ b/plug-ins/autocrop/Makefile.am
@ -9,17 +9,15 @@ autocrop_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 autocrop_DEPENDENCIES = $(DEPS)

--- a/plug-ins/autocrop/autocrop.c
+++ b/plug-ins/autocrop/autocrop.c
@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "libgimp/gimp.h"
-#include "gtk/gtk.h"

 /* Declare local functions. */
 static void query(void);
--- a/plug-ins/autostretch_hsv/Makefile.am
+++ b/plug-ins/autostretch_hsv/Makefile.am
@ -9,17 +9,15 @@ autostretch_hsv_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 autostretch_hsv_DEPENDENCIES = $(DEPS)

--- a/plug-ins/blinds/Makefile.am
+++ b/plug-ins/blinds/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 blinds_DEPENDENCIES = $(DEPS)

--- a/plug-ins/blur/Makefile.am
+++ b/plug-ins/blur/Makefile.am
@ -14,15 +14,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/plug-ins/gpc/libgpc.a			\
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/plug-ins/gpc/libgpc.a	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/gpc/libgpc.a
+	$(top_builddir)/plug-ins/gpc/libgpc.a	\
+	$(top_builddir)/libgimp/libgimp.la

 blur_DEPENDENCIES = $(DEPS)

--- a/plug-ins/bmp/Makefile.am
+++ b/plug-ins/bmp/Makefile.am
@ -11,18 +11,16 @@ bmp_SOURCES = \
 	bmpwrite.c   

 INCLUDES = \
-	$(GTK_CFLAGS)			\
 	-I$(top_srcdir)			\
+	$(GTK_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 bmp_DEPENDENCIES = $(DEPS)

--- a/plug-ins/bumpmap/Makefile.am
+++ b/plug-ins/bumpmap/Makefile.am
@ -13,13 +13,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la

 bumpmap_DEPENDENCIES = $(DEPS)

--- a/plug-ins/bz2/Makefile.am
+++ b/plug-ins/bz2/Makefile.am
@ -9,17 +9,15 @@ bz2_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la
+	$(top_builddir)/libgimp/libgimp.la

 bz2_DEPENDENCIES = $(DEPS)

--- a/plug-ins/bz2/bz2.c
+++ b/plug-ins/bz2/bz2.c
@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "gtk/gtk.h"
 #include "libgimp/gimp.h"


--- a/plug-ins/c_astretch/Makefile.am
+++ b/plug-ins/c_astretch/Makefile.am
@ -9,17 +9,15 @@ c_astretch_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 c_astretch_DEPENDENCIES = $(DEPS)

--- a/plug-ins/checkerboard/Makefile.am
+++ b/plug-ins/checkerboard/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 checkerboard_DEPENDENCIES = $(DEPS)

--- a/plug-ins/colorify/Makefile.am
+++ b/plug-ins/colorify/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 colorify_DEPENDENCIES = $(DEPS)

--- a/plug-ins/common/animationplay.c
+++ b/plug-ins/common/animationplay.c
@ -615,9 +615,12 @@ build_dialog(GImageType basetype,
  GtkWidget* hbox;
  GtkWidget* hbox2;
  GtkWidget* eventbox;
-  guchar* color_cube;
  GdkCursor* cursor;

+#ifndef RAPH_IS_HOME
+  guchar* color_cube;
+#endif
+
  argc = 1;
  argv = g_new (gchar *, 1);
  argv[0] = g_strdup ("animationplay");
--- a/plug-ins/common/autocrop.c
+++ b/plug-ins/common/autocrop.c
@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "libgimp/gimp.h"
-#include "gtk/gtk.h"

 /* Declare local functions. */
 static void query(void);
--- a/plug-ins/common/bz2.c
+++ b/plug-ins/common/bz2.c
@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "gtk/gtk.h"
 #include "libgimp/gimp.h"


--- a/plug-ins/common/fp.c
+++ b/plug-ins/common/fp.c
@ -161,12 +161,12 @@ fp_row (const guchar *src_row,
 	if (P[k]!=m && P[k]!=M) middle=P[k];
      
 	for (k=0; k<3; k++) 
-	  if (M!=m)
+	  if (M!=m) {
 	    if (P[k] == M)
 	      P[k] = MAX(P[k]+Current.satAdj[JudgeBy][Intensity],middle);
 	    else if (P[k] == m)
 	      P[k] = MIN(P[k]-Current.satAdj[JudgeBy][Intensity],middle); 
-	
+	  }

 	
 	P[0] += Current.redAdj[JudgeBy][Intensity];
--- a/plug-ins/common/gee.c
+++ b/plug-ins/common/gee.c
@ -182,7 +182,10 @@ build_dialog(GImageType basetype,
  GtkWidget* vbox;
  GtkWidget* hbox;
  GtkWidget* hbox2;
+
+#ifndef RAPH_IS_HOME
  guchar* color_cube;
+#endif

  argc = 1;
  argv = g_new (gchar *, 1);
--- a/plug-ins/common/mpeg.c
+++ b/plug-ins/common/mpeg.c
@ -69,7 +69,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 #include "libgimp/gimp.h"
 #include "mpeg.h"

--- a/plug-ins/common/pcx.c
+++ b/plug-ins/common/pcx.c
@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gtk/gtk.h"
 #include "libgimp/gimp.h"

 /* Declare plug-in functions.  */
--- a/plug-ins/common/pix.c
+++ b/plug-ins/common/pix.c
@ -46,7 +46,6 @@ static char ident[] = "@(#) GIMP Alias|Wavefront pix image file-plugin v1.0  24-
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <gtk/gtk.h>
 #include <libgimp/gimp.h>

 /* #define PIX_DEBUG */
--- a/plug-ins/common/rotators.c
+++ b/plug-ins/common/rotators.c
@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "libgimp/gimp.h"
-#include "gtk/gtk.h"

 /* Declare local functions. */
 static void query(void);
--- a/plug-ins/common/url.c
+++ b/plug-ins/common/url.c
@ -22,7 +22,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "gtk/gtk.h"
 #include "libgimp/gimp.h"

 /* Author: Josh MacDonald. */
--- a/plug-ins/common/xwd.c
+++ b/plug-ins/common/xwd.c
@ -50,7 +50,6 @@ static char ident[] = "@(#) GIMP XWD file-plugin v1.93  11-Apr-98";
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "gtk/gtk.h"
 #include "libgimp/gimp.h"

 typedef unsigned long L_CARD32;
--- a/plug-ins/common/zealouscrop.c
+++ b/plug-ins/common/zealouscrop.c
@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "libgimp/gimp.h"
-#include "gtk/gtk.h"

 #ifdef HAVE_CONFIG_H
 #include "config.h"
@ -129,8 +128,8 @@ static void do_zcrop(GDrawable *drawable, gint32 image_id)
  gint width, height, x, y;
  guchar *buffer;
  int nreturn_vals;
-  gboolean *killrows;
-  gboolean *killcols;
+  gint8 *killrows;
+  gint8 *killcols;
  gint32 livingrows, livingcols, destrow, destcol;
  int total_area, area;

@ -141,8 +140,8 @@ static void do_zcrop(GDrawable *drawable, gint32 image_id)
  total_area = width * height * 4;
  area = 0;

-  killrows = g_malloc (sizeof(gboolean)*height);
-  killcols = g_malloc (sizeof(gboolean)*width);
+  killrows = g_malloc (sizeof(gint8)*height);
+  killcols = g_malloc (sizeof(gint8)*width);

  buffer = g_malloc((width > height ? width : height) * bytes);

--- a/plug-ins/compose/Makefile.am
+++ b/plug-ins/compose/Makefile.am
@ -13,13 +13,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	

 compose_DEPENDENCIES = $(DEPS)

--- a/plug-ins/convmatrix/Makefile.am
+++ b/plug-ins/convmatrix/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 convmatrix_DEPENDENCIES = $(DEPS)

--- a/plug-ins/cubism/Makefile.am
+++ b/plug-ins/cubism/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 cubism_DEPENDENCIES = $(DEPS)

--- a/plug-ins/dbbrowser/Makefile.am
+++ b/plug-ins/dbbrowser/Makefile.am
@ -18,13 +18,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 dbbrowser_DEPENDENCIES = $(DEPS)

--- a/plug-ins/decompose/Makefile.am
+++ b/plug-ins/decompose/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 decompose_DEPENDENCIES = $(DEPS)

--- a/plug-ins/deinterlace/Makefile.am
+++ b/plug-ins/deinterlace/Makefile.am
@ -15,14 +15,12 @@ INCLUDES = \

 LDADD = \
 	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la			\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/megawidget/libmegawidget.a
+	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
+	$(top_builddir)/libgimp/libgimp.la

 deinterlace_DEPENDENCIES = $(DEPS)

--- a/plug-ins/depthmerge/Makefile.am
+++ b/plug-ins/depthmerge/Makefile.am
@ -13,13 +13,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	

 depthmerge_DEPENDENCIES = $(DEPS)

--- a/plug-ins/despeckle/Makefile.am
+++ b/plug-ins/despeckle/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 despeckle_DEPENDENCIES = $(DEPS)

--- a/plug-ins/destripe/Makefile.am
+++ b/plug-ins/destripe/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 destripe_DEPENDENCIES = $(DEPS)

--- a/plug-ins/diffraction/Makefile.am
+++ b/plug-ins/diffraction/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 diffraction_DEPENDENCIES = $(DEPS)

--- a/plug-ins/displace/Makefile.am
+++ b/plug-ins/displace/Makefile.am
@ -13,13 +13,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	

 displace_DEPENDENCIES = $(DEPS)

--- a/plug-ins/edge/Makefile.am
+++ b/plug-ins/edge/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 edge_DEPENDENCIES = $(DEPS)

--- a/plug-ins/emboss/Makefile.am
+++ b/plug-ins/emboss/Makefile.am
@ -15,14 +15,12 @@ INCLUDES = \

 LDADD = \
 	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la			\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/megawidget/libmegawidget.a
+	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
+	$(top_builddir)/libgimp/libgimp.la

 emboss_DEPENDENCIES = $(DEPS)

--- a/plug-ins/engrave/Makefile.am
+++ b/plug-ins/engrave/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 engrave_DEPENDENCIES = $(DEPS)

--- a/plug-ins/exchange/Makefile.am
+++ b/plug-ins/exchange/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 exchange_DEPENDENCIES = $(DEPS)

--- a/plug-ins/faxg3/Makefile.am
+++ b/plug-ins/faxg3/Makefile.am
@ -12,17 +12,15 @@ faxg3_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 faxg3_DEPENDENCIES = $(DEPS)

--- a/plug-ins/faxg3/faxg3.c
+++ b/plug-ins/faxg3/faxg3.c
@ -29,7 +29,6 @@
 #include <string.h>
 #include <fcntl.h>

-#include <gtk/gtk.h>
 #include <libgimp/gimp.h>
 #include "g3.h"

--- a/plug-ins/film/Makefile.am
+++ b/plug-ins/film/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 film_DEPENDENCIES = $(DEPS)

--- a/plug-ins/fits/Makefile.am
+++ b/plug-ins/fits/Makefile.am
@ -15,13 +15,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 fits_DEPENDENCIES = $(DEPS)

--- a/plug-ins/flame/Makefile.am
+++ b/plug-ins/flame/Makefile.am
@ -22,14 +22,14 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)						\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GTK_LIBS)				\
 	$(LIBUCB_LIB)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	

 flame_DEPENDENCIES = $(DEPS)

--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@ -163,7 +163,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals,
 		GParam ** return_vals)
 {
  static GParam values[1];
-  GDrawable *drawable;
+  GDrawable *drawable = NULL;
  GRunModeType run_mode;
  GStatusType status = STATUS_SUCCESS;

--- a/plug-ins/flame/libifs.c
+++ b/plug-ins/flame/libifs.c
@ -731,7 +731,7 @@ void parse_control_point(ss, cp)
   int argc, i, j;
   int set_cm = 0, set_image_size = 0, set_nbatches = 0, set_white_level = 0, set_cmap_inter = 0;
   int set_spatial_oversample = 0;
-   double *slot, xf, cm, t, nbatches, white_level, spatial_oversample, cmap_inter;
+   double *slot = NULL, xf, cm, t, nbatches, white_level, spatial_oversample, cmap_inter;
   double image_size[2];

   for (i = 0; i < NXFORMS; i++) {
--- a/plug-ins/flame/rect.c
+++ b/plug-ins/flame/rect.c
@ -217,7 +217,7 @@ void render_rectangle(spec, out, out_width, field, nchan, progress)

      /* compute camera */
      if (1) {
-	double t0, t1, shift, corner0, corner1;
+	double t0, t1, shift = 0.0, corner0, corner1;
 	double scale;

 	scale = pow(2.0, cp.zoom);
--- a/plug-ins/flarefx/Makefile.am
+++ b/plug-ins/flarefx/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 flarefx_DEPENDENCIES = $(DEPS)

--- a/plug-ins/fp/Makefile.am
+++ b/plug-ins/fp/Makefile.am
@ -19,13 +19,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 fp_DEPENDENCIES = $(DEPS)

--- a/plug-ins/fp/fp.c
+++ b/plug-ins/fp/fp.c
@ -161,12 +161,12 @@ fp_row (const guchar *src_row,
 	if (P[k]!=m && P[k]!=M) middle=P[k];
      
 	for (k=0; k<3; k++) 
-	  if (M!=m)
+	  if (M!=m) {
 	    if (P[k] == M)
 	      P[k] = MAX(P[k]+Current.satAdj[JudgeBy][Intensity],middle);
 	    else if (P[k] == m)
 	      P[k] = MIN(P[k]-Current.satAdj[JudgeBy][Intensity],middle); 
-	
+	  }

 	
 	P[0] += Current.redAdj[JudgeBy][Intensity];
--- a/plug-ins/fractaltrace/Makefile.am
+++ b/plug-ins/fractaltrace/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 fractaltrace_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gauss_iir/Makefile.am
+++ b/plug-ins/gauss_iir/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gauss_iir_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gauss_rle/Makefile.am
+++ b/plug-ins/gauss_rle/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gauss_rle_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gbr/Makefile.am
+++ b/plug-ins/gbr/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gbr_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gee/Makefile.am
+++ b/plug-ins/gee/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gee_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gee/gee.c
+++ b/plug-ins/gee/gee.c
@ -182,7 +182,10 @@ build_dialog(GImageType basetype,
  GtkWidget* vbox;
  GtkWidget* hbox;
  GtkWidget* hbox2;
+
+#ifndef RAPH_IS_HOME
  guchar* color_cube;
+#endif

  argc = 1;
  argv = g_new (gchar *, 1);
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@ -16,13 +16,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimpui.la	\
+	$(top_builddir)/libgimp/libgimp.la	

 gfig_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gfig/gfig.c
+++ b/plug-ins/gfig/gfig.c
@ -55,8 +55,9 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <math.h>
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 #include "libgimp/gimp.h"
+#include "libgimp/gimpui.h"
 #include "pix_data.h"


@ -3329,6 +3330,7 @@ paint_page()
  return(vbox);
 }

+#if 0 /* NOT USED */
 static void
 gfig_get_brushes(GtkWidget *list)
 {
@ -3387,7 +3389,7 @@ gfig_get_brushes(GtkWidget *list)
  gimp_destroy_params (return_vals, nreturn_vals);
  gtk_list_select_item(GTK_LIST(list),list_item2sel);
 }
-
+#endif

 #if 0 /* NOT USED */
 static gint
@ -3473,9 +3475,6 @@ select_brush_press(GtkWidget *widget,
 static GtkWidget *
 brush_page()
 {
-  GtkWidget *list_frame;
-  GtkWidget *list;
-  GtkWidget *scrolled_win;
  GtkWidget *table;
  GtkWidget *label;
  GtkWidget *pw;
--- a/plug-ins/gfli/Makefile.am
+++ b/plug-ins/gfli/Makefile.am
@ -15,13 +15,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gfli_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gicon/Makefile.am
+++ b/plug-ins/gicon/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gicon_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gif/Makefile.am
+++ b/plug-ins/gif/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gif_DEPENDENCIES = $(DEPS)

--- a/plug-ins/glasstile/Makefile.am
+++ b/plug-ins/glasstile/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 glasstile_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gpc/Makefile.am
+++ b/plug-ins/gpc/Makefile.am
@ -14,15 +14,13 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

-libgpc_aDEPENDENCIES = $(DEPS)
+libgpc_a_DEPENDENCIES = $(DEPS)

 EXTRA_DIST=gpc.3 gpc.man

--- a/plug-ins/gqbist/Makefile.am
+++ b/plug-ins/gqbist/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gqbist_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gradmap/Makefile.am
+++ b/plug-ins/gradmap/Makefile.am
@ -9,17 +9,15 @@ gradmap_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gradmap_DEPENDENCIES = $(DEPS)

--- a/plug-ins/grid/Makefile.am
+++ b/plug-ins/grid/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 grid_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gtm/Makefile.am
+++ b/plug-ins/gtm/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gtm_DEPENDENCIES = $(DEPS)

--- a/plug-ins/guillotine/Makefile.am
+++ b/plug-ins/guillotine/Makefile.am
@ -9,17 +9,15 @@ guillotine_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 guillotine_DEPENDENCIES = $(DEPS)

--- a/plug-ins/gz/Makefile.am
+++ b/plug-ins/gz/Makefile.am
@ -9,17 +9,15 @@ gz_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 gz_DEPENDENCIES = $(DEPS)

--- a/plug-ins/header/Makefile.am
+++ b/plug-ins/header/Makefile.am
@ -9,17 +9,15 @@ header_SOURCES = \

 INCLUDES = \
 	-I$(top_srcdir)			\
-	$(GTK_CFLAGS)			\
+	$(GLIB_CFLAGS)			\
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(GTK_LIBS)
+	$(top_builddir)/libgimp/libgimp.la	\
+	$(GLIB_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 header_DEPENDENCIES = $(DEPS)

--- a/plug-ins/hot/Makefile.am
+++ b/plug-ins/hot/Makefile.am
@ -15,14 +15,12 @@ INCLUDES = \

 LDADD = \
 	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la			\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
-	$(top_builddir)/plug-ins/megawidget/libmegawidget.a
+	$(top_builddir)/plug-ins/megawidget/libmegawidget.a	\
+	$(top_builddir)/libgimp/libgimp.la

 hot_DEPENDENCIES = $(DEPS)

--- a/plug-ins/hrz/Makefile.am
+++ b/plug-ins/hrz/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 hrz_DEPENDENCIES = $(DEPS)

--- a/plug-ins/ifscompose/Makefile.am
+++ b/plug-ins/ifscompose/Makefile.am
@ -15,13 +15,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 ifscompose_DEPENDENCIES = $(DEPS)

--- a/plug-ins/illusion/Makefile.am
+++ b/plug-ins/illusion/Makefile.am
@ -13,13 +13,11 @@ INCLUDES = \
 	-I$(includedir)

 LDADD = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la		\
+	$(top_builddir)/libgimp/libgimp.la	\
 	$(GTK_LIBS)

 DEPS = \
-	$(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la	\
-	$(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la	
+	$(top_builddir)/libgimp/libgimp.la	

 illusion_DEPENDENCIES = $(DEPS)

--- a/Show More
+++ b/Show More