luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CIDER mathematical support routines (maths/misc) are now compiled only 

when CIDER is defined.
This commit is contained in:
pnenzi 2003-08-12 17:16:14 +00:00
parent 88b8906c9a
commit ccee90013b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@ -403,12 +403,18 @@ dnl Add CIDER enhacements to ngspice.
if test "$enable_cider" = "yes"; then if test "$enable_cider" = "yes"; then
AC_MSG_RESULT(CIDER features enabled) AC_MSG_RESULT(CIDER features enabled)
AC_DEFINE(CIDER) AC_DEFINE(CIDER)
CIDERDIR="ciderlib" CIDERDIR="ciderlib"
CIDERSIM=" $CIDERDIR/twod/libcidertwod.a \ CIDERSIM=" $CIDERDIR/twod/libcidertwod.a \
$CIDERDIR/oned/libcideroned.a \ $CIDERDIR/oned/libcideroned.a \
$CIDERDIR/input/libciderinput.a \ $CIDERDIR/input/libciderinput.a \
$CIDERDIR/support/libcidersuprt.a \ " $CIDERDIR/support/libcidersuprt.a \ "
CIDERMATH="misc"
CIDERMATHDIR="maths/misc/libmathmisc.a"
NUMDEV=" spicelib/devices/nbjt/libnbjt.a \ NUMDEV=" spicelib/devices/nbjt/libnbjt.a \
spicelib/devices/nbjt2/libnbjt2.a \ spicelib/devices/nbjt2/libnbjt2.a \
spicelib/devices/numd/libnumd.a \ spicelib/devices/numd/libnumd.a \
@ -425,6 +431,8 @@ CIDERSCRIPTS="devload devaxis ciderinit"
else else
CIDERLIB="" CIDERLIB=""
CIDERSIM="" CIDERSIM=""
CIDERMATH=""
CIDERMATHDIR=""
NUMDEV="" NUMDEV=""
NUMDEVDIR="" NUMDEVDIR=""
CIDERSCRIPTS="" CIDERSCRIPTS=""

2
src/Makefile.am
View File

@ -92,7 +92,7 @@ ngspice_LDADD = \
spicelib/parser/libinp.a \ spicelib/parser/libinp.a \
maths/deriv/libderiv.a \ maths/deriv/libderiv.a \
maths/cmaths/libcmaths.a \ maths/cmaths/libcmaths.a \
maths/misc/libmathsmisc.a \ @CIDERMATHDIR@
maths/poly/libpoly.a \ maths/poly/libpoly.a \
maths/ni/libni.a \ maths/ni/libni.a \
maths/sparse/libsparse.a \ maths/sparse/libsparse.a \

2
src/maths/Makefile.am
View File

@ -1,4 +1,4 @@
# Process this file with automake # Process this file with automake
SUBDIRS = cmaths ni sparse poly deriv misc SUBDIRS = cmaths ni sparse poly deriv @CIDERMATH@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in