From d1b11c39eeb250f4d40ad5a1789f7193f1683404 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Wed, 7 Nov 2012 01:11:04 +0100 Subject: [PATCH] Restored some extremely conditional compilation about KLU, SuperLU and UMFPACK --- configure.ac | 12 +++--------- src/maths/Makefile.am | 5 +---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 56c2f68e9..a6600bb95 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/maths/Makefile.am b/src/maths/Makefile.am index de3e2c90a..b1ddbac79 100644 --- a/src/maths/Makefile.am +++ b/src/maths/Makefile.am @@ -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