From 75f2db148334786573164fa685338de0456a56c1 Mon Sep 17 00:00:00 2001 From: sjborley Date: Wed, 19 Oct 2005 07:09:37 +0000 Subject: [PATCH] Implemented fix to prevent 'multiple definition' errors during link of nghelp when built on systems that use the latest versions of the GNU tools. Solution provided by Andreas Unger . --- ChangeLog | 7 ++++++- src/Makefile.am | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d10a7dd77..e7979a0f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-19 Steven Borley + + * src/Makefile.am: Implemented fix to prevent 'multiple definition' errors + during link of nghelp when built on systems that use the latest versions of + the GNU tools. Solution provided by Andreas Unger . + 2005-10-15 Steven Borley * src/frontend/spiceif.c: Fixed code to avoid errors (invalid lvalue in @@ -18,7 +24,6 @@ supplied by Andreas Unger . Fixes XSpice bug; variable PER was being used before initialisation. - 2005-09-19 Steven Borley * xgraph/idraw.c, xgraph/tgif.c and xgraph/xtb.c: Added missing system header diff --git a/src/Makefile.am b/src/Makefile.am index ce576bd3f..fe785691e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to produce Makefile.in +# $Id$ SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ DIST_SUBDIRS = misc maths frontend spicelib include xspice ciderlib @@ -146,11 +147,13 @@ if WINDOWS nghelp_SOURCES += winmain.c endif -nghelp_LDADD = \ +# We keep the libraries to a minimum here and link against terminal.o +# rather than the full front-end library libfte.a to avoid link errors that +# that would otherwise occur (thanks to Andreas Unger for this fix). +nghelp_LDADD = \ + frontend/terminal.o \ frontend/help/libhlp.a \ - frontend/parser/libparser.a \ - frontend/libfte.a \ - misc/libmisc.a + misc/libmisc.a ## These programs currently fail to build on Windows if !WINDOWS @@ -202,4 +205,4 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_C LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in ngspice.idx