diff --git a/gpsim/extras/Makefile.am b/gpsim/extras/Makefile.am
index 03d35c7..80f0c30 100644
--- a/gpsim/extras/Makefile.am
+++ b/gpsim/extras/Makefile.am
@@ -18,7 +18,7 @@ libgpsim_extras_la_SOURCES = \
          graphic_lcd/src/ssd0323.cc
 
 
-libgpsim_extras_la_LDFLAGS =  @X_LDFLAGS@
+libgpsim_extras_la_LDFLAGS =  @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la
 
 
 
diff --git a/gpsim/src/Makefile.am b/gpsim/src/Makefile.am
index aa76941..d0c229a 100644
--- a/gpsim/src/Makefile.am
+++ b/gpsim/src/Makefile.am
@@ -191,6 +191,6 @@ gpsiminclude_HEADERS = \
 libgpsim_la_LIBADD =  @X_LDFLAGS@
 libgpsim_la_LDFLAGS = -lpthread
 
-SUBDIRS = dspic
+SUBDIRS = . dspic
 
 EXTRA_DIST = makefile.mingw
diff --git a/gpsim/src/dspic/Makefile.am b/gpsim/src/dspic/Makefile.am
index 361e2ec..d219669 100644
--- a/gpsim/src/dspic/Makefile.am
+++ b/gpsim/src/dspic/Makefile.am
@@ -10,6 +10,6 @@ libgpsim_dspic_la_SOURCES = \
 	dspic-instructions.cc dspic-instructions.h \
 	dspic-registers.cc dspic-registers.h
 
-libgpsim_dspic_la_LDFLAGS =  @X_LDFLAGS@
+libgpsim_dspic_la_LDFLAGS =  @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la
 
 EXTRA_DIST = makefile.mingw
diff --git a/gpsim/eXdbm/Makefile.am b/gpsim/eXdbm/Makefile.am
index 2cffa10..6fb6bf7 100644
--- a/gpsim/eXdbm/Makefile.am
+++ b/gpsim/eXdbm/Makefile.am
@@ -27,7 +27,7 @@ libgpsim_eXdbm_la_SOURCES = hash.c parse.c misc.c eXdbm.c \
 
 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 \