--- eXdbm/Makefile.am.link	2010-02-10 14:59:40.000000000 +0100
+++ eXdbm/Makefile.am	2010-02-10 14:59:59.000000000 +0100
@@ -27,7 +27,7 @@
 
 gpsim_eXdbminclude_HEADERS = eXdbm.h eXdbmErrors.h eXdbmTypes.h
 
-libgpsim_eXdbm_la_LIBADD = @X_LDFLAGS@
+libgpsim_eXdbm_la_LIBADD = @X_LDFLAGS@ -lm
 
 EXTRA_DIST = \
 	Makefile.orig README LICENSE COPYING.LIB eXdbm.txt \
--- src/dspic/Makefile.am.link	2010-02-10 15:01:42.000000000 +0100
+++ src/dspic/Makefile.am	2010-02-10 15:02:13.000000000 +0100
@@ -10,5 +10,6 @@
 	dspic-instructions.cc dspic-instructions.h \
 	dspic-registers.cc dspic-registers.h
 
-libgpsim_dspic_la_LDFLAGS =  @X_LDFLAGS@
+libgpsim_dspic_la_LIBADD =  @X_LDFLAGS@ $(top_builddir)/src/libgpsim.la
+
 
--- src/Makefile.am.link	2010-02-10 15:19:02.000000000 +0100
+++ src/Makefile.am	2010-02-10 15:19:14.000000000 +0100
@@ -175,4 +175,4 @@
 libgpsim_la_LIBADD =  @X_LDFLAGS@
 libgpsim_la_LDFLAGS = -lpthread
 
-SUBDIRS = dspic
+SUBDIRS = . dspic