diff -ru gal-0.22/Makefile.in gal-0.22-patched/Makefile.in
--- gal-0.22/Makefile.in	2002-12-05 18:13:21.000000000 +0100
+++ gal-0.22-patched/Makefile.in	2003-01-14 19:32:39.000000000 +0100
@@ -154,7 +154,7 @@
 gnomelocaledir = @gnomelocaledir@
 l = @l@
 
-SUBDIRS = gal po intl tests docs art macros
+SUBDIRS = gal po intl docs art macros
 
 confexecdir = $(libdir)
 confexec_DATA = galConf.sh 
diff -ru gal-0.22/gal/e-table/e-table-memory-store.c gal-0.22-patched/gal/e-table/e-table-memory-store.c
--- gal-0.22/gal/e-table/e-table-memory-store.c	2002-11-26 23:21:40.000000000 +0100
+++ gal-0.22-patched/gal/e-table/e-table-memory-store.c	2003-01-14 16:59:22.000000000 +0100
@@ -26,7 +26,7 @@
 #include "e-table-memory-store.h"
 
 #define PARENT_TYPE e_table_memory_get_type ()
-ETableMemoryClass *parent_class = NULL;
+static ETableMemoryClass *parent_class = NULL;
 
 #define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col)))
 
diff -ru gal-0.22/gal/widgets/e-categories-master-list-dialog-model.c gal-0.22-patched/gal/widgets/e-categories-master-list-dialog-model.c
--- gal-0.22/gal/widgets/e-categories-master-list-dialog-model.c	2002-04-25 22:05:39.000000000 +0200
+++ gal-0.22-patched/gal/widgets/e-categories-master-list-dialog-model.c	2003-01-14 16:59:26.000000000 +0100
@@ -28,7 +28,7 @@
 #include <gnome.h>
 
 #define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
+static ETableModelClass *parent_class;
 
 /*
  * ECategoriesMasterListDialogModel callbacks
diff -ru gal-0.22/ltmain.sh gal-0.22-patched/ltmain.sh
--- gal-0.22/ltmain.sh	2002-12-05 18:12:44.000000000 +0100
+++ gal-0.22-patched/ltmain.sh	2003-01-14 19:31:12.000000000 +0100
@@ -2952,7 +2952,23 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
+	  save_deplibs="$deplibs"
+	  for conv in $convenience; do
+	    tmp_deplibs=
+	    for test_deplib in $deplibs; do
+	      if test "$test_deplib" != "$conv"; then
+	        tmp_deplibs="$tmp_deplibs $test_deplib"
+	      fi
+	    done
+	    deplibs="$tmp_deplibs"
+	  done
 	  eval cmds=\"$archive_cmds\"
+	  deplibs="$save_deplibs"
 	fi
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
diff -ru gal-0.22/po/Makefile.in.in gal-0.22-patched/po/Makefile.in.in
--- gal-0.22/po/Makefile.in.in	2002-12-05 18:12:58.000000000 +0100
+++ gal-0.22-patched/po/Makefile.in.in	2003-01-14 19:33:40.000000000 +0100
@@ -106,7 +106,7 @@
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//' -e 's/\.mo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \