Restored some extremely conditional compilation about KLU, SuperLU and UMFPACK

This commit is contained in:
Francesco Lannutti 2012-11-07 01:11:04 +01:00 committed by Francesco Lannutti
parent 38947fb651
commit d1b11c39ee
2 changed files with 4 additions and 13 deletions

View File

@ -1123,15 +1123,6 @@ fi
# Output Files
# ------------
AM_COND_IF([KLU_WANTED],
[AC_CONFIG_FILES([src/maths/KLU/Makefile])])
AM_COND_IF([SuperLU_WANTED],
[AC_CONFIG_FILES([src/maths/SuperLU/Makefile])])
AM_COND_IF([UMFPACK_WANTED],
[AC_CONFIG_FILES([src/maths/UMFPACK/Makefile])])
AC_CONFIG_FILES([Makefile
man/Makefile
man/man1/Makefile
@ -1215,6 +1206,9 @@ AC_CONFIG_FILES([Makefile
src/maths/deriv/Makefile
src/maths/poly/Makefile
src/maths/sparse/Makefile
src/maths/KLU/Makefile
src/maths/SuperLU/Makefile
src/maths/UMFPACK/Makefile
src/misc/Makefile
src/xspice/Makefile
src/xspice/cm/Makefile

View File

@ -1,21 +1,18 @@
## Process this file with automake
SUBDIRS = cmaths ni sparse poly deriv misc fft
DIST_SUBDIRS = cmaths ni sparse poly deriv misc fft
DIST_SUBDIRS = cmaths ni sparse poly deriv misc fft KLU SuperLU UMFPACK
if KLU_WANTED
SUBDIRS += KLU
DIST_SUBDIRS += KLU
endif
if SuperLU_WANTED
SUBDIRS += SuperLU
DIST_SUBDIRS += SuperLU
endif
if UMFPACK_WANTED
SUBDIRS += UMFPACK
DIST_SUBDIRS += UMFPACK
endif
MAINTAINERCLEANFILES = Makefile.in