From 1e9ba171d89a2fda157c6fa45325a6cab55f2055 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Wed, 26 Nov 2008 09:40:16 +0000
Subject: [PATCH] Updated some Makefiles for generating distribution tarball.

---
 Makefile.am                      |  4 +++-
 configure.in                     | 12 ++++++++++++
 doc/version.texi                 |  4 ++--
 src/Makefile.am                  |  3 ++-
 src/frontend/Makefile.am         |  1 +
 src/spicelib/devices/Makefile.am |  2 ++
 tests/Makefile.am                |  6 +++++-
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6c89cedaf..98d8088c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,9 @@ DIST_SUBDIRS = @XGRAPHDIR@ doc src man tests
 
 EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 		ANALYSES BUGS AUTHORS ChangeLog \
-		DEVICES NEWS README contrib patches examples @NOTXGRAPH@
+		DEVICES NEWS README README.tcl \
+		README.adms contrib patches \
+		examples visualc @NOTXGRAPH@
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 			config.h.in config.sub configure install-sh \
diff --git a/configure.in b/configure.in
index 5222784c0..babf28918 100644
--- a/configure.in
+++ b/configure.in
@@ -833,6 +833,8 @@ if test "$enable_adms" = "yes"; then
                adms/mextram \
                adms/ekv \
                adms/psp102 "
+   
+   NOTVLADEVDIR=""
 
    VLADEV=" spicelib/devices/adms/hicum0/libhicum0.la \
             spicelib/devices/adms/hicum2/libhicum2.la \
@@ -840,10 +842,15 @@ if test "$enable_adms" = "yes"; then
             spicelib/devices/adms/ekv/libekv.la \
             spicelib/devices/adms/psp102/libpsp102.la "
 
+else
+
+    VLADEVDIR=""
+    NOTVLADEVDIR="adms"
 fi
 AC_SUBST(ADMSXML)
 AC_SUBST(VLADEVDIR)
 AC_SUBST(VLADEV)
+AC_SUBST(NOTVLADEVDIR)
 
 dnl NDEV option
 if test "$enable_ndev" = "yes"; then
@@ -851,14 +858,18 @@ if test "$enable_ndev" = "yes"; then
     AC_DEFINE(NDEV,[],[The NDEV interface])
     NDEV=""
     NDEV_DIR=" ndev "
+    NOTNDEV_DIR=""
     NDEV_LIB=" spicelib/devices/ndev/libndev.la "
+    
 else
     NDEV=""
     NDEV_DIR=""
     NDEV_LIB=""
+    NOTNDEV_DIR="ndev"
 fi
 AC_SUBST(NDEV_DIR)
 AC_SUBST(NDEV_LIB)
+AC_SUBST(NOTNDEV_DIR)
 
 
 dnl Cluster option
@@ -1052,6 +1063,7 @@ AC_CONFIG_FILES([Makefile
                  tests/sensitivity/Makefile
                  tests/transient/Makefile
                  tests/transmission/Makefile
+		 tests/TransImpedanceAmp/Makefile
                  tests/resistance/Makefile
                  tests/vbic/Makefile])
 AC_OUTPUT
diff --git a/doc/version.texi b/doc/version.texi
index 83d100aab..46e87106b 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 01 December 2008
-@set UPDATED-MONTH December 2008
+@set UPDATED 25 November 2008
+@set UPDATED-MONTH November 2008
 @set EDITION 18
 @set VERSION 18
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e914c015..4a0ebfd4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,8 @@ endif
 endif
 
 EXTRA_DIST = ngspice.txt ngspice.idx setplot spectrum \
-	     devload devaxis ciderinit winmain.c 
+	     devload devaxis ciderinit winmain.c unsupported \
+	     tclspice.c tclspice.map pkgIndex.tcl.in tclspinit.in
 
 helpdatadir = $(pkgdatadir)/helpdir
 
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 0832e6cef..4306baf69 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -3,6 +3,7 @@
 
 SUBDIRS = plotting help parser wdisp numparam
 DIST_SUBDIRS = plotting help parser wdisp numparam
+EXTRA_DIST = testcommands.c
 
 noinst_LTLIBRARIES = libfte.la
 
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index 8007fdab5..ac4e70e98 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -132,6 +132,8 @@ libdev_la_SOURCES = 	\
 	cktinit.c	\
 	limit.c
 
+EXTRA_DIST = @NOTNDEV_DIR@ @NOTVLADEVDIR@
+
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8d54df469..1c955062c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ SUBDIRS = bsim1			\
 	resistance		\
 	sensitivity		\
 	transient		\
+	TransImpedanceAmp	\
 	transmission		\
 	vbic
 		
@@ -44,12 +45,15 @@ DIST_SUBDIRS = 	bsim1	\
 	resistance	\
 	sensitivity	\
 	transient	\
+	TransImpedanceAmp \
 	transmission	\
 	vbic
 
 TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
 
 EXTRA_DIST = \
-	README bin
+	README bin adms \
+	tcl tcl-testbench1 tcl-testbench2 tcl-testbench3 tcl-testbench4
+ 
 
 MAINTAINERCLEANFILES = Makefile.in