From c59baf92ef9584387476d5afe35043207e70e1b4 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 13 Apr 2012 16:07:17 +0200 Subject: [PATCH] adms wieder rein als AM_CONDITIONAL --- configure.ac | 3 +++ src/spicelib/devices/Makefile.am | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 44bb7107a..58b38158c 100644 --- a/configure.ac +++ b/configure.ac @@ -888,6 +888,8 @@ fi AC_SUBST(ADMSXML) +AM_CONDITIONAL([ADMS_WANTED], [test "$enable_adms3" = "yes"]) + dnl NDEV option if test "$enable_ndev" = "yes"; then AC_MSG_RESULT(NDEV features enabled) @@ -978,6 +980,7 @@ AC_CONFIG_FILES([Makefile src/spicelib/Makefile src/spicelib/analysis/Makefile src/spicelib/devices/Makefile + src/spicelib/devices/adms/Makefile src/spicelib/devices/asrc/Makefile src/spicelib/devices/bjt/Makefile src/spicelib/devices/bsim1/Makefile diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index d9443c223..b72b52634 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -58,6 +58,10 @@ if NUMDEV_WANTED SUBDIRS += nbjt nbjt2 numd numd2 numos endif +if ADMS_WANTED +SUBDIRS += adms +endif + DIST_SUBDIRS = \ asrc \ bjt \