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

Fixed the KLU package to let it correctly compile in libngspice.so

This commit is contained in:
Francesco Lannutti 2014-05-04 16:40:25 +02:00 committed by rlar
parent c11cec02b2
commit fe072aba9d
3 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -547,6 +547,10 @@ libngspice_la_LIBADD += \
ciderlib/support/libcidersuprt.la ciderlib/support/libcidersuprt.la
endif endif
if KLU_WANTED
libngspice_la_LIBADD += maths/KLU/libKLU.la
endif
libngspice_la_LIBADD += \ libngspice_la_LIBADD += \
maths/deriv/libderiv.la \ maths/deriv/libderiv.la \
maths/cmaths/libcmaths.la \ maths/cmaths/libcmaths.la \

60
src/maths/KLU/Makefile.am
View File

@ -3,36 +3,13 @@
noinst_LTLIBRARIES = libKLU_real.la libKLU_complex.la libKLU.la noinst_LTLIBRARIES = libKLU_real.la libKLU_complex.la libKLU.la
libKLU_real_la_SOURCES = \ libKLU_real_la_SOURCES = \
amd_1.c \
amd_2.c \
amd_aat.c \
amd_control.c \
amd_defaults.c \
amd_dump.c \
amd_global.c \
amd_info.c \
amd_order.c \
amd_postorder.c \
amd_post_tree.c \
amd_preprocess.c \
amd_valid.c \
btf_maxtrans.c \
btf_order.c \
btf_strongcomp.c \
colamd.c \
colamd_global.c \
klu.c \ klu.c \
klu_analyze.c \
klu_analyze_given.c \
klu_defaults.c \
klu_diagnostics.c \ klu_diagnostics.c \
klu_dump.c \ klu_dump.c \
klu_extract.c \ klu_extract.c \
klu_factor.c \ klu_factor.c \
klu_free_numeric.c \ klu_free_numeric.c \
klu_free_symbolic.c \
klu_kernel.c \ klu_kernel.c \
klu_memory.c \
klu_refactor.c \ klu_refactor.c \
klu_scale.c \ klu_scale.c \
klu_solve.c \ klu_solve.c \
@ -44,6 +21,24 @@ libKLU_real_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
libKLU_complex_la_SOURCES = \ libKLU_complex_la_SOURCES = \
klu.c \
klu_diagnostics.c \
klu_dump.c \
klu_extract.c \
klu_factor.c \
klu_free_numeric.c \
klu_kernel.c \
klu_refactor.c \
klu_scale.c \
klu_solve.c \
klu_sort.c \
klu_tsolve.c
libKLU_complex_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -DCOMPLEX
libKLU_la_SOURCES = \
amd_1.c \ amd_1.c \
amd_2.c \ amd_2.c \
amd_aat.c \ amd_aat.c \
@ -62,29 +57,11 @@ libKLU_complex_la_SOURCES = \
btf_strongcomp.c \ btf_strongcomp.c \
colamd.c \ colamd.c \
colamd_global.c \ colamd_global.c \
klu.c \
klu_analyze.c \ klu_analyze.c \
klu_analyze_given.c \ klu_analyze_given.c \
klu_defaults.c \ klu_defaults.c \
klu_diagnostics.c \
klu_dump.c \
klu_extract.c \
klu_factor.c \
klu_free_numeric.c \
klu_free_symbolic.c \ klu_free_symbolic.c \
klu_kernel.c \
klu_memory.c \ klu_memory.c \
klu_refactor.c \
klu_scale.c \
klu_solve.c \
klu_sort.c \
klu_tsolve.c
libKLU_complex_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -DCOMPLEX
libKLU_la_SOURCES = \
klusmp.c klusmp.c
libKLU_la_LIBADD = \ libKLU_la_LIBADD = \
@ -93,5 +70,6 @@ libKLU_la_LIBADD = \
libKLU_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include libKLU_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

3
src/maths/sparse/Makefile.am
View File

@ -10,13 +10,14 @@ libsparse_la_SOURCES = \
spextra.c \ spextra.c \
spfactor.c \ spfactor.c \
spoutput.c \ spoutput.c \
spsmp.c \
spsolve.c \ spsolve.c \
sputils.c sputils.c
if KLU_WANTED if KLU_WANTED
libsparse_la_SOURCES += spCSC.c libsparse_la_SOURCES += spCSC.c
else
libsparse_la_SOURCES += spsmp.c
endif endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include