diff -Naur gpsim-0.22.0.orig/cli/Makefile.am gpsim-0.22.0/cli/Makefile.am
--- gpsim-0.22.0.orig/cli/Makefile.am	2006-07-02 04:59:01.000000000 +0200
+++ gpsim-0.22.0/cli/Makefile.am	2007-01-29 15:14:09.000000000 +0100
@@ -47,7 +47,7 @@
 	cmd_stimulus.h cmd_x.h symbol_t.h cmd_frequency.h cmd_icd.h \
 	cmd_macro.h ui_gpsim.h
 
-libgpsimcli_la_LIBADD = $(LIBREADLINE)
+libgpsimcli_la_LIBADD = $(LIBREADLINE) ../eXdbm/libgpsim_eXdbm.la
 
 AM_YFLAGS = -dvt
 
diff -Naur gpsim-0.22.0.orig/gpsim/Makefile.am gpsim-0.22.0/gpsim/Makefile.am
--- gpsim-0.22.0.orig/gpsim/Makefile.am	2006-04-09 04:09:31.000000000 +0200
+++ gpsim-0.22.0/gpsim/Makefile.am	2007-01-29 15:17:07.000000000 +0100
@@ -9,6 +9,6 @@
 gpsim_SOURCES = main.cc
 
 gpsim_LDFLAGS =  $(shell gtk-config --cflags)
-gpsim_LDADD = ../src/libgpsim.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
-  ../eXdbm/libgpsim_eXdbm.la @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
+gpsim_LDADD = ../src/libgpsim.la ../eXdbm/libgpsim_eXdbm.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
+  @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
   @X_LDFLAGS@ @Y_LDFLAGS@ @LIBREADLINE@
diff -Naur gpsim-0.22.0.orig/gui/Makefile.am gpsim-0.22.0/gui/Makefile.am
--- gpsim-0.22.0.orig/gui/Makefile.am	2006-05-02 04:48:54.000000000 +0200
+++ gpsim-0.22.0/gui/Makefile.am	2007-01-29 15:15:14.000000000 +0100
@@ -17,6 +17,7 @@
 	preferences.cc preferences.h \
 	settings.h settings_exdbm.h
 
+libgpsimgui_la_LIBADD = ../eXdbm/libgpsim_eXdbm.la
 libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
 
 pixmapdir = $(datadir)/gpsim
diff -Naur gpsim-0.22.0.orig/Makefile.am gpsim-0.22.0/Makefile.am
--- gpsim-0.22.0.orig/Makefile.am	2006-10-21 04:06:53.000000000 +0200
+++ gpsim-0.22.0/Makefile.am	2007-01-29 15:17:37.000000000 +0100
@@ -1,5 +1,5 @@
 
-SUBDIRS = cli xpms eXdbm gui src gpsim modules examples doc regression
+SUBDIRS = eXdbm cli xpms gui src gpsim modules examples doc regression
 
 dist-hook:
 	cp gpsim.spec $(distdir)