--- gui/Makefile.am.orig	2005-09-19 17:54:21 +0400
+++ gui/Makefile.am	2006-07-22 11:28:45 +0400
@@ -17,7 +17,7 @@
 	preferences.cc preferences.h \
 	settings.h settings_exdbm.h
 
-libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
+libgpsimgui_la_LIBADD = @X_LDFLAGS@ @Y_LDFLAGS@ @GTK@ @GDK@ @GLIB@ @LIBREADLINE@ ../eXdbm/libgpsim_eXdbm.la ../src/libgpsim.la ../cli/libgpsimcli.la
 
 pixmapdir = $(datadir)/gpsim
 
--- src/Makefile.am.orig	2005-07-27 08:20:31 +0400
+++ src/Makefile.am	2006-07-22 11:35:49 +0400
@@ -150,5 +150,6 @@
 
 
 #libgpsim_la_LDFLAGS = $(shell gtk-config --libs)
-libgpsim_la_LDFLAGS =  @X_LDFLAGS@ 
+libgpsim_la_LIBADD =  @X_LDFLAGS@
+libgpsim_la_LDFLAGS = -lpthread
 
--- cli/Makefile.am.orig	2005-04-27 04:55:13 +0400
+++ cli/Makefile.am	2006-07-22 11:36:20 +0400
@@ -50,7 +50,7 @@
 
 AM_YFLAGS = -dvt
 
-libgpsimcli_la_LDFLAGS = @X_LDFLAGS@
+libgpsimcli_la_LIBADD = @X_LDFLAGS@ @LIBREADLINE@ ../eXdbm/libgpsim_eXdbm.la ../src/libgpsim.la
 
 
 EXTRA_DIST = scan.h parse.h
--- eXdbm/Makefile.am.orig	2001-12-28 04:13:42 +0300
+++ eXdbm/Makefile.am	2006-07-22 11:39:32 +0400
@@ -27,16 +27,10 @@
 
 gpsim_eXdbminclude_HEADERS = eXdbm.h eXdbmErrors.h eXdbmTypes.h
 
-libgpsim_eXdbm_la_LDFLAGS =  @X_LDFLAGS@
+libgpsim_eXdbm_la_LIBADD = @X_LDFLAGS@
 
 EXTRA_DIST = \
 	Makefile.orig README LICENSE COPYING.LIB eXdbm.txt \
 	test1.c test2.c test3.c test1.cfg.orig test2.cfg \
 	README.gpsim
 
-
-
-
-
-
-

--- Makefile.am.orig	2006-10-21 06:06:53 +0400
+++ Makefile.am	2006-12-25 01:37:12 +0300
@@ -1,5 +1,5 @@
 
-SUBDIRS = cli xpms eXdbm gui src gpsim modules examples doc regression
+SUBDIRS = eXdbm src cli xpms gui gpsim modules examples doc regression
 
 dist-hook:
 	cp gpsim.spec $(distdir)     


--- modules/Makefile.am.orig	2005-04-23 18:27:49 +0400
+++ modules/Makefile.am	2006-07-22 12:04:25 +0400
@@ -18,5 +18,6 @@
 	encoder.cc encoder.h
 
 
-libgpsim_modules_la_LDFLAGS =  @X_LDFLAGS@
+libgpsim_modules_la_LIBADD = ../eXdbm/libgpsim_eXdbm.la -lstdc++ -lpopt \
+  @X_LDFLAGS@ @Y_LDFLAGS@ @LIBREADLINE@ ../src/libgpsim.la