From c1b4aa25fe17d79600c8327cbb729e8e8f1d9bde Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov Date: Sat, 2 Oct 2010 17:04:43 +0400 Subject: [PATCH 1/3] fix linking with libgpsim --- gpsim/extras/ds1307/Makefile.am | 2 +- gpsim/extras/graphic_lcd/src/Makefile.am | 2 +- gpsim/extras/lcd/Makefile.am | 2 +- gpsim/src/dspic/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gpsim/extras/ds1307/Makefile.am b/gpsim/extras/ds1307/Makefile.am index 6c2cf6f..c924066 100644 --- a/gpsim/extras/ds1307/Makefile.am +++ b/gpsim/extras/ds1307/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libgpsim_ds1307.la libgpsim_ds1307_la_SOURCES = \ module_manager.cc ds1307.cc -libgpsim_ds1307_la_LDFLAGS = @X_LDFLAGS@ +libgpsim_ds1307_la_LIBADD = @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la diff --git a/gpsim/extras/graphic_lcd/src/Makefile.am b/gpsim/extras/graphic_lcd/src/Makefile.am index e308eb0..7b47515 100644 --- a/gpsim/extras/graphic_lcd/src/Makefile.am +++ b/gpsim/extras/graphic_lcd/src/Makefile.am @@ -10,6 +10,6 @@ libgpsim_graphicLCD_la_SOURCES = \ sed1520.cc sed1520.h \ ssd0323.cc ssd0323.h -libgpsim_graphicLCD_la_LDFLAGS = @X_LDFLAGS@ +libgpsim_graphicLCD_la_LIBADD = @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la EXTRA_DIST = makefile.mingw diff --git a/gpsim/extras/lcd/Makefile.am b/gpsim/extras/lcd/Makefile.am index c1fbd4a..0c9b496 100644 --- a/gpsim/extras/lcd/Makefile.am +++ b/gpsim/extras/lcd/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libgpsim_lcd.la libgpsim_lcd_la_SOURCES = \ lcdgui.cc module_manager.cc lcd.cc hd44780.cc -libgpsim_lcd_la_LDFLAGS = @X_LDFLAGS@ +libgpsim_lcd_la_LIBADD = @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la diff --git a/gpsim/src/dspic/Makefile.am b/gpsim/src/dspic/Makefile.am index da57cb8..82071e2 100755 --- 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_LIBADD = @X_LDFLAGS@ $(top_srcdir)/src/libgpsim.la EXTRA_DIST = makefile.mingw diff --git a/gpsim/src/Makefile.am b/gpsim/src/Makefile.am index 1e4b998..a232a75 100755 --- a/gpsim/src/Makefile.am +++ b/gpsim/src/Makefile.am @@ -177,6 +177,6 @@ gpsiminclude_HEADERS = \ libgpsim_la_LIBADD = @X_LDFLAGS@ libgpsim_la_LDFLAGS = -lpthread -SUBDIRS = dspic +SUBDIRS = . dspic EXTRA_DIST = makefile.mingw -- 1.7.2.3