Browse Source

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 <a_unger@gmx.de>.

pre-master-46
sjborley 21 years ago
parent
commit
75f2db1483
  1. 7
      ChangeLog
  2. 13
      src/Makefile.am

7
ChangeLog

@ -1,3 +1,9 @@
2005-10-19 Steven Borley <steven.borley@virgin.net>
* 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 <a_unger@gmx.de>.
2005-10-15 Steven Borley <steven.borley@virgin.net>
* src/frontend/spiceif.c: Fixed code to avoid errors (invalid lvalue in
@ -18,7 +24,6 @@
supplied by Andreas Unger <a_unger@gmx.de>. Fixes XSpice bug; variable PER
was being used before initialisation.
2005-09-19 Steven Borley <steven.borley@virgin.net>
* xgraph/idraw.c, xgraph/tgif.c and xgraph/xtb.c: Added missing system header

13
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
Loading…
Cancel
Save