From e3c077ea1cb151d83866ca76612107d87ed72972 Mon Sep 17 00:00:00 2001
From: arno <arno>
Date: Mon, 24 Jul 2000 21:06:46 +0000
Subject: [PATCH]         * src/spicelib/devices/analysis/*: Moved all files to
         src/spicelib/analysis.

        * configure.in, src/Makefile.am, src/spicelib/Makefile.am,
        src/spicelib/devices/Makefile.am: Files affected by the move.
---
 configure.in                                    | 4 ++--
 src/Makefile.am                                 | 2 +-
 src/spicelib/ChangeLog                          | 8 ++++++++
 src/spicelib/Makefile.am                        | 3 ++-
 src/spicelib/{devices => }/analysis/.cvsignore  | 0
 src/spicelib/{devices => }/analysis/ChangeLog   | 0
 src/spicelib/{devices => }/analysis/Makefile.am | 0
 src/spicelib/{devices => }/analysis/acan.c      | 0
 src/spicelib/{devices => }/analysis/acaskq.c    | 0
 src/spicelib/{devices => }/analysis/acsetp.c    | 0
 src/spicelib/{devices => }/analysis/ckt.h       | 0
 src/spicelib/{devices => }/analysis/cktacct.c   | 0
 src/spicelib/{devices => }/analysis/cktacdum.c  | 0
 src/spicelib/{devices => }/analysis/cktaskaq.c  | 0
 src/spicelib/{devices => }/analysis/cktasknq.c  | 0
 src/spicelib/{devices => }/analysis/cktbkdum.c  | 0
 src/spicelib/{devices => }/analysis/cktclrbk.c  | 0
 src/spicelib/{devices => }/analysis/cktdelt.c   | 0
 src/spicelib/{devices => }/analysis/cktdest.c   | 0
 src/spicelib/{devices => }/analysis/cktdisto.c  | 0
 src/spicelib/{devices => }/analysis/cktdlti.c   | 0
 src/spicelib/{devices => }/analysis/cktdltm.c   | 0
 src/spicelib/{devices => }/analysis/cktdltn.c   | 0
 src/spicelib/{devices => }/analysis/cktdojob.c  | 0
 src/spicelib/{devices => }/analysis/cktdump.c   | 0
 src/spicelib/{devices => }/analysis/cktfbran.c  | 0
 src/spicelib/{devices => }/analysis/cktfnda.c   | 0
 src/spicelib/{devices => }/analysis/cktfndm.c   | 0
 src/spicelib/{devices => }/analysis/cktfnode.c  | 0
 src/spicelib/{devices => }/analysis/cktftask.c  | 0
 src/spicelib/{devices => }/analysis/cktgrnd.c   | 0
 src/spicelib/{devices => }/analysis/ckti2nod.c  | 0
 src/spicelib/{devices => }/analysis/cktic.c     | 0
 src/spicelib/{devices => }/analysis/cktlnkeq.c  | 0
 src/spicelib/{devices => }/analysis/cktload.c   | 0
 src/spicelib/{devices => }/analysis/cktmapn.c   | 0
 src/spicelib/{devices => }/analysis/cktmask.c   | 0
 src/spicelib/{devices => }/analysis/cktmcrt.c   | 0
 src/spicelib/{devices => }/analysis/cktmkcur.c  | 0
 src/spicelib/{devices => }/analysis/cktmknod.c  | 0
 src/spicelib/{devices => }/analysis/cktmkvol.c  | 0
 src/spicelib/{devices => }/analysis/cktmpar.c   | 0
 src/spicelib/{devices => }/analysis/cktnames.c  | 0
 src/spicelib/{devices => }/analysis/cktnewan.c  | 0
 src/spicelib/{devices => }/analysis/cktneweq.c  | 0
 src/spicelib/{devices => }/analysis/cktnewn.c   | 0
 src/spicelib/{devices => }/analysis/cktnodn.c   | 0
 src/spicelib/{devices => }/analysis/cktnoise.c  | 0
 src/spicelib/{devices => }/analysis/cktntask.c  | 0
 src/spicelib/{devices => }/analysis/cktnum2n.c  | 0
 src/spicelib/{devices => }/analysis/cktop.c     | 0
 src/spicelib/{devices => }/analysis/cktparam.c  | 0
 src/spicelib/{devices => }/analysis/cktpartn.c  | 0
 src/spicelib/{devices => }/analysis/cktpmnam.c  | 0
 src/spicelib/{devices => }/analysis/cktpname.c  | 0
 src/spicelib/{devices => }/analysis/cktpzld.c   | 0
 src/spicelib/{devices => }/analysis/cktpzset.c  | 0
 src/spicelib/{devices => }/analysis/cktpzstr.c  | 0
 src/spicelib/{devices => }/analysis/cktsens.c   | 0
 src/spicelib/{devices => }/analysis/cktsetap.c  | 0
 src/spicelib/{devices => }/analysis/cktsetbk.c  | 0
 src/spicelib/{devices => }/analysis/cktsetnp.c  | 0
 src/spicelib/{devices => }/analysis/cktsetup.c  | 0
 src/spicelib/{devices => }/analysis/cktsgen.c   | 0
 src/spicelib/{devices => }/analysis/cktsopt.c   | 0
 src/spicelib/{devices => }/analysis/ckttemp.c   | 0
 src/spicelib/{devices => }/analysis/cktterr.c   | 0
 src/spicelib/{devices => }/analysis/ckttroub.c  | 0
 src/spicelib/{devices => }/analysis/ckttrunc.c  | 0
 src/spicelib/{devices => }/analysis/ckttyplk.c  | 0
 src/spicelib/{devices => }/analysis/daskq.c     | 0
 src/spicelib/{devices => }/analysis/dcoaskq.c   | 0
 src/spicelib/{devices => }/analysis/dcop.c      | 0
 src/spicelib/{devices => }/analysis/dcosetp.c   | 0
 src/spicelib/{devices => }/analysis/dctaskq.c   | 0
 src/spicelib/{devices => }/analysis/dctran.c    | 0
 src/spicelib/{devices => }/analysis/dctrcurv.c  | 0
 src/spicelib/{devices => }/analysis/dctsetp.c   | 0
 src/spicelib/{devices => }/analysis/distoan.c   | 0
 src/spicelib/{devices => }/analysis/dkerproc.c  | 0
 src/spicelib/{devices => }/analysis/dloadfns.c  | 0
 src/spicelib/{devices => }/analysis/dsetparm.c  | 0
 src/spicelib/{devices => }/analysis/naskq.c     | 0
 src/spicelib/{devices => }/analysis/nevalsrc.c  | 0
 src/spicelib/{devices => }/analysis/ninteg.c    | 0
 src/spicelib/{devices => }/analysis/noisean.c   | 0
 src/spicelib/{devices => }/analysis/nsetparm.c  | 0
 src/spicelib/{devices => }/analysis/pzan.c      | 0
 src/spicelib/{devices => }/analysis/pzaskq.c    | 0
 src/spicelib/{devices => }/analysis/pzsetp.c    | 0
 src/spicelib/{devices => }/analysis/sensaskq.c  | 0
 src/spicelib/{devices => }/analysis/senssetp.c  | 0
 src/spicelib/{devices => }/analysis/tfanal.c    | 0
 src/spicelib/{devices => }/analysis/tfaskq.c    | 0
 src/spicelib/{devices => }/analysis/tfsetp.c    | 0
 src/spicelib/{devices => }/analysis/tranaskq.c  | 0
 src/spicelib/{devices => }/analysis/traninit.c  | 0
 src/spicelib/{devices => }/analysis/transetp.c  | 0
 src/spicelib/devices/Makefile.am                | 1 -
 99 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 src/spicelib/ChangeLog
 rename src/spicelib/{devices => }/analysis/.cvsignore (100%)
 rename src/spicelib/{devices => }/analysis/ChangeLog (100%)
 rename src/spicelib/{devices => }/analysis/Makefile.am (100%)
 rename src/spicelib/{devices => }/analysis/acan.c (100%)
 rename src/spicelib/{devices => }/analysis/acaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/acsetp.c (100%)
 rename src/spicelib/{devices => }/analysis/ckt.h (100%)
 rename src/spicelib/{devices => }/analysis/cktacct.c (100%)
 rename src/spicelib/{devices => }/analysis/cktacdum.c (100%)
 rename src/spicelib/{devices => }/analysis/cktaskaq.c (100%)
 rename src/spicelib/{devices => }/analysis/cktasknq.c (100%)
 rename src/spicelib/{devices => }/analysis/cktbkdum.c (100%)
 rename src/spicelib/{devices => }/analysis/cktclrbk.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdelt.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdest.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdisto.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdlti.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdltm.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdltn.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdojob.c (100%)
 rename src/spicelib/{devices => }/analysis/cktdump.c (100%)
 rename src/spicelib/{devices => }/analysis/cktfbran.c (100%)
 rename src/spicelib/{devices => }/analysis/cktfnda.c (100%)
 rename src/spicelib/{devices => }/analysis/cktfndm.c (100%)
 rename src/spicelib/{devices => }/analysis/cktfnode.c (100%)
 rename src/spicelib/{devices => }/analysis/cktftask.c (100%)
 rename src/spicelib/{devices => }/analysis/cktgrnd.c (100%)
 rename src/spicelib/{devices => }/analysis/ckti2nod.c (100%)
 rename src/spicelib/{devices => }/analysis/cktic.c (100%)
 rename src/spicelib/{devices => }/analysis/cktlnkeq.c (100%)
 rename src/spicelib/{devices => }/analysis/cktload.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmapn.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmask.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmcrt.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmkcur.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmknod.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmkvol.c (100%)
 rename src/spicelib/{devices => }/analysis/cktmpar.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnames.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnewan.c (100%)
 rename src/spicelib/{devices => }/analysis/cktneweq.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnewn.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnodn.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnoise.c (100%)
 rename src/spicelib/{devices => }/analysis/cktntask.c (100%)
 rename src/spicelib/{devices => }/analysis/cktnum2n.c (100%)
 rename src/spicelib/{devices => }/analysis/cktop.c (100%)
 rename src/spicelib/{devices => }/analysis/cktparam.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpartn.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpmnam.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpname.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpzld.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpzset.c (100%)
 rename src/spicelib/{devices => }/analysis/cktpzstr.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsens.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsetap.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsetbk.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsetnp.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsetup.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsgen.c (100%)
 rename src/spicelib/{devices => }/analysis/cktsopt.c (100%)
 rename src/spicelib/{devices => }/analysis/ckttemp.c (100%)
 rename src/spicelib/{devices => }/analysis/cktterr.c (100%)
 rename src/spicelib/{devices => }/analysis/ckttroub.c (100%)
 rename src/spicelib/{devices => }/analysis/ckttrunc.c (100%)
 rename src/spicelib/{devices => }/analysis/ckttyplk.c (100%)
 rename src/spicelib/{devices => }/analysis/daskq.c (100%)
 rename src/spicelib/{devices => }/analysis/dcoaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/dcop.c (100%)
 rename src/spicelib/{devices => }/analysis/dcosetp.c (100%)
 rename src/spicelib/{devices => }/analysis/dctaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/dctran.c (100%)
 rename src/spicelib/{devices => }/analysis/dctrcurv.c (100%)
 rename src/spicelib/{devices => }/analysis/dctsetp.c (100%)
 rename src/spicelib/{devices => }/analysis/distoan.c (100%)
 rename src/spicelib/{devices => }/analysis/dkerproc.c (100%)
 rename src/spicelib/{devices => }/analysis/dloadfns.c (100%)
 rename src/spicelib/{devices => }/analysis/dsetparm.c (100%)
 rename src/spicelib/{devices => }/analysis/naskq.c (100%)
 rename src/spicelib/{devices => }/analysis/nevalsrc.c (100%)
 rename src/spicelib/{devices => }/analysis/ninteg.c (100%)
 rename src/spicelib/{devices => }/analysis/noisean.c (100%)
 rename src/spicelib/{devices => }/analysis/nsetparm.c (100%)
 rename src/spicelib/{devices => }/analysis/pzan.c (100%)
 rename src/spicelib/{devices => }/analysis/pzaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/pzsetp.c (100%)
 rename src/spicelib/{devices => }/analysis/sensaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/senssetp.c (100%)
 rename src/spicelib/{devices => }/analysis/tfanal.c (100%)
 rename src/spicelib/{devices => }/analysis/tfaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/tfsetp.c (100%)
 rename src/spicelib/{devices => }/analysis/tranaskq.c (100%)
 rename src/spicelib/{devices => }/analysis/traninit.c (100%)
 rename src/spicelib/{devices => }/analysis/transetp.c (100%)

diff --git a/configure.in b/configure.in
index b4f831418..0c2763b89 100644
--- a/configure.in
+++ b/configure.in
@@ -197,9 +197,9 @@ doc/Makefile			\
 man/Makefile			\
 man/man1/Makefile		\
 src/Makefile			\
-src/spicelib/Makefile	\
+src/spicelib/Makefile		\
+src/spicelib/analysis/Makefile	\
 src/spicelib/devices/Makefile		\
-src/spicelib/devices/analysis/Makefile	\
 src/spicelib/devices/asrc/Makefile	\
 src/spicelib/devices/bjt/Makefile	\
 src/spicelib/devices/bsim1/Makefile	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ba14dca2..7b42e588b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,7 @@ ngspice_LDADD = \
 	frontend/libfte.a \
 	frontend/plotting/libplotting.a \
 	$(DYNAMIC_DEVICELIBS) \
-	spicelib/devices/analysis/libckt.a \
+	spicelib/analysis/libckt.a \
 	spicelib/devices/libdev.a \
 	frontend/parser/libparser.a \
 	frontend/help/libhlp.a \
diff --git a/src/spicelib/ChangeLog b/src/spicelib/ChangeLog
new file mode 100644
index 000000000..d8eacade8
--- /dev/null
+++ b/src/spicelib/ChangeLog
@@ -0,0 +1,8 @@
+2000-07-24  Arno W. Peters  <A.W.Peters@ieee.org>
+
+	* src/spicelib/devices/analysis/*: Moved all files to
+	src/spicelib/analysis.
+
+	* configure.in, src/spicelib/Makefile.am,
+	src/spicelib/devices/Makefile.am: Files affected by the move.
+	
diff --git a/src/spicelib/Makefile.am b/src/spicelib/Makefile.am
index 55114bd30..0c05b92e4 100644
--- a/src/spicelib/Makefile.am
+++ b/src/spicelib/Makefile.am
@@ -1,4 +1,5 @@
 # Process this file with automake
 
-SUBDIRS = devices
+SUBDIRS = analysis devices
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/analysis/.cvsignore b/src/spicelib/analysis/.cvsignore
similarity index 100%
rename from src/spicelib/devices/analysis/.cvsignore
rename to src/spicelib/analysis/.cvsignore
diff --git a/src/spicelib/devices/analysis/ChangeLog b/src/spicelib/analysis/ChangeLog
similarity index 100%
rename from src/spicelib/devices/analysis/ChangeLog
rename to src/spicelib/analysis/ChangeLog
diff --git a/src/spicelib/devices/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am
similarity index 100%
rename from src/spicelib/devices/analysis/Makefile.am
rename to src/spicelib/analysis/Makefile.am
diff --git a/src/spicelib/devices/analysis/acan.c b/src/spicelib/analysis/acan.c
similarity index 100%
rename from src/spicelib/devices/analysis/acan.c
rename to src/spicelib/analysis/acan.c
diff --git a/src/spicelib/devices/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/acaskq.c
rename to src/spicelib/analysis/acaskq.c
diff --git a/src/spicelib/devices/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/acsetp.c
rename to src/spicelib/analysis/acsetp.c
diff --git a/src/spicelib/devices/analysis/ckt.h b/src/spicelib/analysis/ckt.h
similarity index 100%
rename from src/spicelib/devices/analysis/ckt.h
rename to src/spicelib/analysis/ckt.h
diff --git a/src/spicelib/devices/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktacct.c
rename to src/spicelib/analysis/cktacct.c
diff --git a/src/spicelib/devices/analysis/cktacdum.c b/src/spicelib/analysis/cktacdum.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktacdum.c
rename to src/spicelib/analysis/cktacdum.c
diff --git a/src/spicelib/devices/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktaskaq.c
rename to src/spicelib/analysis/cktaskaq.c
diff --git a/src/spicelib/devices/analysis/cktasknq.c b/src/spicelib/analysis/cktasknq.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktasknq.c
rename to src/spicelib/analysis/cktasknq.c
diff --git a/src/spicelib/devices/analysis/cktbkdum.c b/src/spicelib/analysis/cktbkdum.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktbkdum.c
rename to src/spicelib/analysis/cktbkdum.c
diff --git a/src/spicelib/devices/analysis/cktclrbk.c b/src/spicelib/analysis/cktclrbk.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktclrbk.c
rename to src/spicelib/analysis/cktclrbk.c
diff --git a/src/spicelib/devices/analysis/cktdelt.c b/src/spicelib/analysis/cktdelt.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdelt.c
rename to src/spicelib/analysis/cktdelt.c
diff --git a/src/spicelib/devices/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdest.c
rename to src/spicelib/analysis/cktdest.c
diff --git a/src/spicelib/devices/analysis/cktdisto.c b/src/spicelib/analysis/cktdisto.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdisto.c
rename to src/spicelib/analysis/cktdisto.c
diff --git a/src/spicelib/devices/analysis/cktdlti.c b/src/spicelib/analysis/cktdlti.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdlti.c
rename to src/spicelib/analysis/cktdlti.c
diff --git a/src/spicelib/devices/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdltm.c
rename to src/spicelib/analysis/cktdltm.c
diff --git a/src/spicelib/devices/analysis/cktdltn.c b/src/spicelib/analysis/cktdltn.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdltn.c
rename to src/spicelib/analysis/cktdltn.c
diff --git a/src/spicelib/devices/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdojob.c
rename to src/spicelib/analysis/cktdojob.c
diff --git a/src/spicelib/devices/analysis/cktdump.c b/src/spicelib/analysis/cktdump.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktdump.c
rename to src/spicelib/analysis/cktdump.c
diff --git a/src/spicelib/devices/analysis/cktfbran.c b/src/spicelib/analysis/cktfbran.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktfbran.c
rename to src/spicelib/analysis/cktfbran.c
diff --git a/src/spicelib/devices/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktfnda.c
rename to src/spicelib/analysis/cktfnda.c
diff --git a/src/spicelib/devices/analysis/cktfndm.c b/src/spicelib/analysis/cktfndm.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktfndm.c
rename to src/spicelib/analysis/cktfndm.c
diff --git a/src/spicelib/devices/analysis/cktfnode.c b/src/spicelib/analysis/cktfnode.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktfnode.c
rename to src/spicelib/analysis/cktfnode.c
diff --git a/src/spicelib/devices/analysis/cktftask.c b/src/spicelib/analysis/cktftask.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktftask.c
rename to src/spicelib/analysis/cktftask.c
diff --git a/src/spicelib/devices/analysis/cktgrnd.c b/src/spicelib/analysis/cktgrnd.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktgrnd.c
rename to src/spicelib/analysis/cktgrnd.c
diff --git a/src/spicelib/devices/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c
similarity index 100%
rename from src/spicelib/devices/analysis/ckti2nod.c
rename to src/spicelib/analysis/ckti2nod.c
diff --git a/src/spicelib/devices/analysis/cktic.c b/src/spicelib/analysis/cktic.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktic.c
rename to src/spicelib/analysis/cktic.c
diff --git a/src/spicelib/devices/analysis/cktlnkeq.c b/src/spicelib/analysis/cktlnkeq.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktlnkeq.c
rename to src/spicelib/analysis/cktlnkeq.c
diff --git a/src/spicelib/devices/analysis/cktload.c b/src/spicelib/analysis/cktload.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktload.c
rename to src/spicelib/analysis/cktload.c
diff --git a/src/spicelib/devices/analysis/cktmapn.c b/src/spicelib/analysis/cktmapn.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmapn.c
rename to src/spicelib/analysis/cktmapn.c
diff --git a/src/spicelib/devices/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmask.c
rename to src/spicelib/analysis/cktmask.c
diff --git a/src/spicelib/devices/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmcrt.c
rename to src/spicelib/analysis/cktmcrt.c
diff --git a/src/spicelib/devices/analysis/cktmkcur.c b/src/spicelib/analysis/cktmkcur.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmkcur.c
rename to src/spicelib/analysis/cktmkcur.c
diff --git a/src/spicelib/devices/analysis/cktmknod.c b/src/spicelib/analysis/cktmknod.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmknod.c
rename to src/spicelib/analysis/cktmknod.c
diff --git a/src/spicelib/devices/analysis/cktmkvol.c b/src/spicelib/analysis/cktmkvol.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmkvol.c
rename to src/spicelib/analysis/cktmkvol.c
diff --git a/src/spicelib/devices/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktmpar.c
rename to src/spicelib/analysis/cktmpar.c
diff --git a/src/spicelib/devices/analysis/cktnames.c b/src/spicelib/analysis/cktnames.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnames.c
rename to src/spicelib/analysis/cktnames.c
diff --git a/src/spicelib/devices/analysis/cktnewan.c b/src/spicelib/analysis/cktnewan.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnewan.c
rename to src/spicelib/analysis/cktnewan.c
diff --git a/src/spicelib/devices/analysis/cktneweq.c b/src/spicelib/analysis/cktneweq.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktneweq.c
rename to src/spicelib/analysis/cktneweq.c
diff --git a/src/spicelib/devices/analysis/cktnewn.c b/src/spicelib/analysis/cktnewn.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnewn.c
rename to src/spicelib/analysis/cktnewn.c
diff --git a/src/spicelib/devices/analysis/cktnodn.c b/src/spicelib/analysis/cktnodn.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnodn.c
rename to src/spicelib/analysis/cktnodn.c
diff --git a/src/spicelib/devices/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnoise.c
rename to src/spicelib/analysis/cktnoise.c
diff --git a/src/spicelib/devices/analysis/cktntask.c b/src/spicelib/analysis/cktntask.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktntask.c
rename to src/spicelib/analysis/cktntask.c
diff --git a/src/spicelib/devices/analysis/cktnum2n.c b/src/spicelib/analysis/cktnum2n.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktnum2n.c
rename to src/spicelib/analysis/cktnum2n.c
diff --git a/src/spicelib/devices/analysis/cktop.c b/src/spicelib/analysis/cktop.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktop.c
rename to src/spicelib/analysis/cktop.c
diff --git a/src/spicelib/devices/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktparam.c
rename to src/spicelib/analysis/cktparam.c
diff --git a/src/spicelib/devices/analysis/cktpartn.c b/src/spicelib/analysis/cktpartn.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpartn.c
rename to src/spicelib/analysis/cktpartn.c
diff --git a/src/spicelib/devices/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpmnam.c
rename to src/spicelib/analysis/cktpmnam.c
diff --git a/src/spicelib/devices/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpname.c
rename to src/spicelib/analysis/cktpname.c
diff --git a/src/spicelib/devices/analysis/cktpzld.c b/src/spicelib/analysis/cktpzld.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpzld.c
rename to src/spicelib/analysis/cktpzld.c
diff --git a/src/spicelib/devices/analysis/cktpzset.c b/src/spicelib/analysis/cktpzset.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpzset.c
rename to src/spicelib/analysis/cktpzset.c
diff --git a/src/spicelib/devices/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktpzstr.c
rename to src/spicelib/analysis/cktpzstr.c
diff --git a/src/spicelib/devices/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsens.c
rename to src/spicelib/analysis/cktsens.c
diff --git a/src/spicelib/devices/analysis/cktsetap.c b/src/spicelib/analysis/cktsetap.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsetap.c
rename to src/spicelib/analysis/cktsetap.c
diff --git a/src/spicelib/devices/analysis/cktsetbk.c b/src/spicelib/analysis/cktsetbk.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsetbk.c
rename to src/spicelib/analysis/cktsetbk.c
diff --git a/src/spicelib/devices/analysis/cktsetnp.c b/src/spicelib/analysis/cktsetnp.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsetnp.c
rename to src/spicelib/analysis/cktsetnp.c
diff --git a/src/spicelib/devices/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsetup.c
rename to src/spicelib/analysis/cktsetup.c
diff --git a/src/spicelib/devices/analysis/cktsgen.c b/src/spicelib/analysis/cktsgen.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsgen.c
rename to src/spicelib/analysis/cktsgen.c
diff --git a/src/spicelib/devices/analysis/cktsopt.c b/src/spicelib/analysis/cktsopt.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktsopt.c
rename to src/spicelib/analysis/cktsopt.c
diff --git a/src/spicelib/devices/analysis/ckttemp.c b/src/spicelib/analysis/ckttemp.c
similarity index 100%
rename from src/spicelib/devices/analysis/ckttemp.c
rename to src/spicelib/analysis/ckttemp.c
diff --git a/src/spicelib/devices/analysis/cktterr.c b/src/spicelib/analysis/cktterr.c
similarity index 100%
rename from src/spicelib/devices/analysis/cktterr.c
rename to src/spicelib/analysis/cktterr.c
diff --git a/src/spicelib/devices/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c
similarity index 100%
rename from src/spicelib/devices/analysis/ckttroub.c
rename to src/spicelib/analysis/ckttroub.c
diff --git a/src/spicelib/devices/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c
similarity index 100%
rename from src/spicelib/devices/analysis/ckttrunc.c
rename to src/spicelib/analysis/ckttrunc.c
diff --git a/src/spicelib/devices/analysis/ckttyplk.c b/src/spicelib/analysis/ckttyplk.c
similarity index 100%
rename from src/spicelib/devices/analysis/ckttyplk.c
rename to src/spicelib/analysis/ckttyplk.c
diff --git a/src/spicelib/devices/analysis/daskq.c b/src/spicelib/analysis/daskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/daskq.c
rename to src/spicelib/analysis/daskq.c
diff --git a/src/spicelib/devices/analysis/dcoaskq.c b/src/spicelib/analysis/dcoaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/dcoaskq.c
rename to src/spicelib/analysis/dcoaskq.c
diff --git a/src/spicelib/devices/analysis/dcop.c b/src/spicelib/analysis/dcop.c
similarity index 100%
rename from src/spicelib/devices/analysis/dcop.c
rename to src/spicelib/analysis/dcop.c
diff --git a/src/spicelib/devices/analysis/dcosetp.c b/src/spicelib/analysis/dcosetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/dcosetp.c
rename to src/spicelib/analysis/dcosetp.c
diff --git a/src/spicelib/devices/analysis/dctaskq.c b/src/spicelib/analysis/dctaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/dctaskq.c
rename to src/spicelib/analysis/dctaskq.c
diff --git a/src/spicelib/devices/analysis/dctran.c b/src/spicelib/analysis/dctran.c
similarity index 100%
rename from src/spicelib/devices/analysis/dctran.c
rename to src/spicelib/analysis/dctran.c
diff --git a/src/spicelib/devices/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c
similarity index 100%
rename from src/spicelib/devices/analysis/dctrcurv.c
rename to src/spicelib/analysis/dctrcurv.c
diff --git a/src/spicelib/devices/analysis/dctsetp.c b/src/spicelib/analysis/dctsetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/dctsetp.c
rename to src/spicelib/analysis/dctsetp.c
diff --git a/src/spicelib/devices/analysis/distoan.c b/src/spicelib/analysis/distoan.c
similarity index 100%
rename from src/spicelib/devices/analysis/distoan.c
rename to src/spicelib/analysis/distoan.c
diff --git a/src/spicelib/devices/analysis/dkerproc.c b/src/spicelib/analysis/dkerproc.c
similarity index 100%
rename from src/spicelib/devices/analysis/dkerproc.c
rename to src/spicelib/analysis/dkerproc.c
diff --git a/src/spicelib/devices/analysis/dloadfns.c b/src/spicelib/analysis/dloadfns.c
similarity index 100%
rename from src/spicelib/devices/analysis/dloadfns.c
rename to src/spicelib/analysis/dloadfns.c
diff --git a/src/spicelib/devices/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c
similarity index 100%
rename from src/spicelib/devices/analysis/dsetparm.c
rename to src/spicelib/analysis/dsetparm.c
diff --git a/src/spicelib/devices/analysis/naskq.c b/src/spicelib/analysis/naskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/naskq.c
rename to src/spicelib/analysis/naskq.c
diff --git a/src/spicelib/devices/analysis/nevalsrc.c b/src/spicelib/analysis/nevalsrc.c
similarity index 100%
rename from src/spicelib/devices/analysis/nevalsrc.c
rename to src/spicelib/analysis/nevalsrc.c
diff --git a/src/spicelib/devices/analysis/ninteg.c b/src/spicelib/analysis/ninteg.c
similarity index 100%
rename from src/spicelib/devices/analysis/ninteg.c
rename to src/spicelib/analysis/ninteg.c
diff --git a/src/spicelib/devices/analysis/noisean.c b/src/spicelib/analysis/noisean.c
similarity index 100%
rename from src/spicelib/devices/analysis/noisean.c
rename to src/spicelib/analysis/noisean.c
diff --git a/src/spicelib/devices/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c
similarity index 100%
rename from src/spicelib/devices/analysis/nsetparm.c
rename to src/spicelib/analysis/nsetparm.c
diff --git a/src/spicelib/devices/analysis/pzan.c b/src/spicelib/analysis/pzan.c
similarity index 100%
rename from src/spicelib/devices/analysis/pzan.c
rename to src/spicelib/analysis/pzan.c
diff --git a/src/spicelib/devices/analysis/pzaskq.c b/src/spicelib/analysis/pzaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/pzaskq.c
rename to src/spicelib/analysis/pzaskq.c
diff --git a/src/spicelib/devices/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/pzsetp.c
rename to src/spicelib/analysis/pzsetp.c
diff --git a/src/spicelib/devices/analysis/sensaskq.c b/src/spicelib/analysis/sensaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/sensaskq.c
rename to src/spicelib/analysis/sensaskq.c
diff --git a/src/spicelib/devices/analysis/senssetp.c b/src/spicelib/analysis/senssetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/senssetp.c
rename to src/spicelib/analysis/senssetp.c
diff --git a/src/spicelib/devices/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
similarity index 100%
rename from src/spicelib/devices/analysis/tfanal.c
rename to src/spicelib/analysis/tfanal.c
diff --git a/src/spicelib/devices/analysis/tfaskq.c b/src/spicelib/analysis/tfaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/tfaskq.c
rename to src/spicelib/analysis/tfaskq.c
diff --git a/src/spicelib/devices/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/tfsetp.c
rename to src/spicelib/analysis/tfsetp.c
diff --git a/src/spicelib/devices/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c
similarity index 100%
rename from src/spicelib/devices/analysis/tranaskq.c
rename to src/spicelib/analysis/tranaskq.c
diff --git a/src/spicelib/devices/analysis/traninit.c b/src/spicelib/analysis/traninit.c
similarity index 100%
rename from src/spicelib/devices/analysis/traninit.c
rename to src/spicelib/analysis/traninit.c
diff --git a/src/spicelib/devices/analysis/transetp.c b/src/spicelib/analysis/transetp.c
similarity index 100%
rename from src/spicelib/devices/analysis/transetp.c
rename to src/spicelib/analysis/transetp.c
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index 01044eedf..b4d7684fd 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -31,7 +31,6 @@ SUBDIRS = \
 	vccs	\
 	vcvs	\
 	vsrc	\
-	analysis \
 	parser
 
 lib_LIBRARIES = libdev.a