From 1f82eccd29c6307271e64dad71ad75d778d610e6 Mon Sep 17 00:00:00 2001 From: arno Date: Fri, 16 Jun 2000 21:11:59 +0000 Subject: [PATCH] * src/devices/disto/*: Moved all files to src/maths/deriv/ * configure.in src/Makefile.am src/devices/Makefile.am src/include/ngspice.h src/maths/Makefile.am: Necessary updates to get it to compile again. --- configure.in | 2 +- src/Makefile.am | 1 + src/include/ngspice.h | 2 +- src/maths/Makefile.am | 2 +- src/{spicelib/devices/disto => maths/deriv}/.cvsignore | 0 src/{spicelib/devices/disto => maths/deriv}/Makefile.am | 4 ++-- src/{spicelib/devices/disto => maths/deriv}/atander.c | 0 src/{spicelib/devices/disto => maths/deriv}/cosderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/cubeder.c | 0 src/{spicelib/devices/disto => maths/deriv}/divderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/equalder.c | 0 src/{spicelib/devices/disto => maths/deriv}/expderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/invderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/multder.c | 0 src/{spicelib/devices/disto => maths/deriv}/plusder.c | 0 src/{spicelib/devices/disto => maths/deriv}/powderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/sqrtder.c | 0 src/{spicelib/devices/disto => maths/deriv}/tanderiv.c | 0 src/{spicelib/devices/disto => maths/deriv}/timesder.c | 0 src/spicelib/devices/Makefile.am | 1 - src/spicelib/devices/disto/ChangeLog | 4 ---- 21 files changed, 6 insertions(+), 10 deletions(-) rename src/{spicelib/devices/disto => maths/deriv}/.cvsignore (100%) rename src/{spicelib/devices/disto => maths/deriv}/Makefile.am (84%) rename src/{spicelib/devices/disto => maths/deriv}/atander.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/cosderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/cubeder.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/divderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/equalder.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/expderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/invderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/multder.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/plusder.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/powderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/sqrtder.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/tanderiv.c (100%) rename src/{spicelib/devices/disto => maths/deriv}/timesder.c (100%) delete mode 100644 src/spicelib/devices/disto/ChangeLog diff --git a/configure.in b/configure.in index 17540ba73..3b3b45c6d 100644 --- a/configure.in +++ b/configure.in @@ -214,7 +214,6 @@ src/devices/ccvs/Makefile \ src/devices/csw/Makefile \ src/devices/devsup/Makefile \ src/devices/dio/Makefile \ -src/devices/disto/Makefile \ src/devices/ind/Makefile \ src/devices/isrc/Makefile \ src/devices/jfet/Makefile \ @@ -239,6 +238,7 @@ src/include/Makefile \ src/maths/Makefile \ src/maths/cmaths/Makefile \ src/maths/ni/Makefile \ +src/maths/partialderiv/Makefile \ src/maths/poly/Makefile \ src/maths/sparse/Makefile \ src/misc/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index 1da2f0ce4..7602f1382 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,6 +74,7 @@ ngspice_LDADD = \ parser/libparser.a \ hlp/libhlp.a \ circuit/libinp.a \ + maths/deriv/libderiv.a \ maths/cmaths/libcmaths.a \ maths/poly/libpoly.a \ maths/ni/libni.a \ diff --git a/src/include/ngspice.h b/src/include/ngspice.h index 31026b5d1..7f8a12c5c 100644 --- a/src/include/ngspice.h +++ b/src/include/ngspice.h @@ -7,7 +7,7 @@ * This file will eventually replace spice.h and lots of other * files in src/include */ - +#define _GNU_SOURCE #include #include diff --git a/src/maths/Makefile.am b/src/maths/Makefile.am index e9f72164b..fbf0b1bd5 100644 --- a/src/maths/Makefile.am +++ b/src/maths/Makefile.am @@ -1,4 +1,4 @@ # Process this file with automake -SUBDIRS = cmaths ni sparse poly +SUBDIRS = cmaths ni sparse poly deriv MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/devices/disto/.cvsignore b/src/maths/deriv/.cvsignore similarity index 100% rename from src/spicelib/devices/disto/.cvsignore rename to src/maths/deriv/.cvsignore diff --git a/src/spicelib/devices/disto/Makefile.am b/src/maths/deriv/Makefile.am similarity index 84% rename from src/spicelib/devices/disto/Makefile.am rename to src/maths/deriv/Makefile.am index 4ee2e40dd..260e76133 100644 --- a/src/spicelib/devices/disto/Makefile.am +++ b/src/maths/deriv/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in -pkglib_LTLIBRARIES = libdisto.la +noinst_LIBRARIES = libderiv.a -libdisto_la_SOURCES = \ +libderiv_a_SOURCES = \ atander.c \ cosderiv.c \ cubeder.c \ diff --git a/src/spicelib/devices/disto/atander.c b/src/maths/deriv/atander.c similarity index 100% rename from src/spicelib/devices/disto/atander.c rename to src/maths/deriv/atander.c diff --git a/src/spicelib/devices/disto/cosderiv.c b/src/maths/deriv/cosderiv.c similarity index 100% rename from src/spicelib/devices/disto/cosderiv.c rename to src/maths/deriv/cosderiv.c diff --git a/src/spicelib/devices/disto/cubeder.c b/src/maths/deriv/cubeder.c similarity index 100% rename from src/spicelib/devices/disto/cubeder.c rename to src/maths/deriv/cubeder.c diff --git a/src/spicelib/devices/disto/divderiv.c b/src/maths/deriv/divderiv.c similarity index 100% rename from src/spicelib/devices/disto/divderiv.c rename to src/maths/deriv/divderiv.c diff --git a/src/spicelib/devices/disto/equalder.c b/src/maths/deriv/equalder.c similarity index 100% rename from src/spicelib/devices/disto/equalder.c rename to src/maths/deriv/equalder.c diff --git a/src/spicelib/devices/disto/expderiv.c b/src/maths/deriv/expderiv.c similarity index 100% rename from src/spicelib/devices/disto/expderiv.c rename to src/maths/deriv/expderiv.c diff --git a/src/spicelib/devices/disto/invderiv.c b/src/maths/deriv/invderiv.c similarity index 100% rename from src/spicelib/devices/disto/invderiv.c rename to src/maths/deriv/invderiv.c diff --git a/src/spicelib/devices/disto/multder.c b/src/maths/deriv/multder.c similarity index 100% rename from src/spicelib/devices/disto/multder.c rename to src/maths/deriv/multder.c diff --git a/src/spicelib/devices/disto/plusder.c b/src/maths/deriv/plusder.c similarity index 100% rename from src/spicelib/devices/disto/plusder.c rename to src/maths/deriv/plusder.c diff --git a/src/spicelib/devices/disto/powderiv.c b/src/maths/deriv/powderiv.c similarity index 100% rename from src/spicelib/devices/disto/powderiv.c rename to src/maths/deriv/powderiv.c diff --git a/src/spicelib/devices/disto/sqrtder.c b/src/maths/deriv/sqrtder.c similarity index 100% rename from src/spicelib/devices/disto/sqrtder.c rename to src/maths/deriv/sqrtder.c diff --git a/src/spicelib/devices/disto/tanderiv.c b/src/maths/deriv/tanderiv.c similarity index 100% rename from src/spicelib/devices/disto/tanderiv.c rename to src/maths/deriv/tanderiv.c diff --git a/src/spicelib/devices/disto/timesder.c b/src/maths/deriv/timesder.c similarity index 100% rename from src/spicelib/devices/disto/timesder.c rename to src/maths/deriv/timesder.c diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index 3a64da7d2..9b9026c71 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -15,7 +15,6 @@ SUBDIRS = \ csw \ devsup \ dio \ - disto \ ind \ isrc \ jfet \ diff --git a/src/spicelib/devices/disto/ChangeLog b/src/spicelib/devices/disto/ChangeLog deleted file mode 100644 index b553d15b2..000000000 --- a/src/spicelib/devices/disto/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -1999-09-08 Arno - - * *.c: reformatted; put prototypes in distodef.h; protoized. -