Fully dynamic device models
The dynamic models were only being compiled for the bsim3* models.
The attached patch adds dynamic loadable models for all the other
models. I am in the process of compiling the tree to test this patch.
The problem hacking this kind of support: make a small modification to
a Makefile.am file and you practically end up recompiling the whole
tree :-/
If everything goes well, tomorrow morning I can tell if my
modifications actually lead to a compilable tree. For those
adventurous enough to try it, be my guest. Paolo, I will be
submitting this patch to you if it works.
Greetings,
--
Arno
diff -ruN ng-spice-rework-8/Makefile.am ng-spice-x/Makefile.am
--- ng-spice-rework-8/Makefile.am Sun Mar 26 12:30:42 2000
+++ ng-spice-x/Makefile.am Mon Mar 27 23:03:04 2000
@@ -8,3 +8,8 @@
config.h.in config.sub configure install-sh \
missing mkinstalldirs stamp-h.in ltconfig \
ltmain.sh
+
+mrproper: maintainer-clean
+ rm -f `find . -type f -name "*~" -print`
+ rm -f `find . -type f -name "*.orig" -print`
+ rm -f `find . -type f -name "*.rej" -print`
diff -ruN ng-spice-rework-8/configure.in ng-spice-x/configure.in
--- ng-spice-rework-8/configure.in Sun Mar 26 15:03:01 2000
+++ ng-spice-x/configure.in Mon Mar 27 21:18:05 2000
@@ -87,7 +87,6 @@
AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
-AC_PROG_RANLIB
dnl Checks for X11 header files and libraries - X11 support can be disabled
diff -ruN ng-spice-rework-8/src/Makefile.am ng-spice-x/src/Makefile.am
--- ng-spice-rework-8/src/Makefile.am Sun Mar 26 12:30:42 2000
+++ ng-spice-x/src/Makefile.am Mon Mar 27 22:59:30 2000
@@ -12,14 +12,49 @@
-STATIC_DEVICELIBS = devices/libdev.a
-
-DYNAMIC_DEVICELIBS = \
+DYNAMIC_DEVICELIBS = \
+ devices/asrc/libasrc.la \
+ devices/bjt/libbjt.la \
devices/bsim1/libbsim1.la \
devices/bsim2/libbsim2.la \
devices/bsim3/libbsim3.la \
devices/bsim3v1/libbsim3v1.la \
- devices/bsim3v2/libbsim3v2.la
+ devices/bsim3v2/libbsim3v2.la \
+ devices/cap/libcap.la \
+ devices/cccs/libcccs.la \
+ devices/ccvs/libccvs.la \
+ devices/csw/libcsw.la \
+ devices/devsup/libdevsup.la \
+ devices/dio/libdio.la \
+ devices/disto/libdisto.la \
+ devices/ind/libind.la \
+ devices/isrc/libisrc.la \
+ devices/jfet/libjfet.la \
+ devices/jfet2/libjfet2.la \
+ devices/ltra/libltra.la \
+ devices/cccs/libcccs.la \
+ devices/ccvs/libccvs.la \
+ devices/csw/libcsw.la \
+ devices/devsup/libdevsup.la \
+ devices/dio/libdio.la \
+ devices/disto/libdisto.la \
+ devices/ind/libind.la \
+ devices/isrc/libisrc.la \
+ devices/jfet/libjfet.la \
+ devices/jfet2/libjfet2.la \
+ devices/ltra/libltra.la \
+ devices/mes/libmes.la \
+ devices/mos1/libmos1.la \
+ devices/mos2/libmos2.la \
+ devices/mos3/libmos3.la \
+ devices/mos6/libmos6.la \
+ devices/res/libres.la \
+ devices/sw/libsw.la \
+ devices/tra/libtra.la \
+ devices/urc/liburc.la \
+ devices/vccs/libvccs.la \
+ devices/vcvs/libvcvs.la \
+ devices/vsrc/libvsrc.la
## Build ngspice first:
@@ -31,7 +66,6 @@
ngspice_LDADD = \
spice.o \
frontend/libfte.a \
- $(STATIC_DEVICELIBS) \
$(DYNAMIC_DEVICELIBS) \
analysis/libckt.a \
parser/libparser.a \
diff -ruN ng-spice-rework-8/src/Makefile.am.orig
ng-spice-x/src/Makefile.am.orig
--- ng-spice-rework-8/src/Makefile.am.orig Sun Mar 26 12:30:52 2000
+++ ng-spice-x/src/Makefile.am.orig Thu Jan 1 01:00:00 1970
@@ -1,119 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = analysis circuit devices frontend hlp maths misc parser include
-
-bin_PROGRAMS = ngspice nutmeg help sconvert proc2mod multidec makeidx
-
-EXTRA_DIST = ngspice.txt ngspice.idx
-
-helpdatadir = $(pkgdatadir)/helpdir
-
-helpdata_DATA = ngspice.idx ngspice.txt
-
-
-
-STATIC_DEVICELIBS = devices/libdev.a
-
-DYNAMIC_DEVICELIBS = \
- devices/bsim1/libbsim1.la \
- devices/bsim2/libbsim2.la \
- devices/bsim3/libbsim3.la \
- devices/bsim3v1/libbsim3v1.la \
- devices/bsim3v2/libbsim3v2.la
-
-## Build ngspice first:
-
-ngspice_SOURCES = conf.c
-
-ngspice_LDADD = \
- ngspice.o \
- frontend/libfte.a \
- $(STATIC_DEVICELIBS) \
- $(DYNAMIC_DEVICELIBS) \
- analysis/libckt.a \
- parser/libparser.a \
- hlp/libhlp.a \
- circuit/libinp.a \
- maths/cmaths/libcmaths.a \
- maths/ni/libni.a \
- maths/sparse/libsparse.a \
- misc/libmisc.a
-
-
-ngspice.o: main.c
- $(COMPILE) -DSIMULATOR -o ngspice.o -c $(srcdir)/main.c
-
-## nutmeg:
-
-nutmeg_SOURCES = main.c nconf.c
-
-nutmeg_LDADD = \
- frontend/libfte.a \
- parser/libparser.a \
- hlp/libhlp.a \
- maths/cmaths/libcmaths.a \
- misc/libmisc.a
-
-
-
-## help:
-
-help_SOURCES = help.c
-
-help_LDADD = \
- hlp/libhlp.a \
- parser/libparser.a \
- misc/libmisc.a
-
-
-## sconvert:
-
-sconvert_SOURCES = sconvert.c
-
-
-
-sconvert_LDADD = \
- frontend/libfte.a \
- parser/libparser.a \
- misc/libmisc.a
-
-
-## proc2mod:
-
-proc2mod_SOURCES = proc2mod.c
-
-proc2mod_LDADD = \
- parser/libparser.a \
- circuit/libinp.a \
- misc/libmisc.a
-
-
-
-## multidec:
-
-multidec_SOURCES = multidec.c
-
-multidec_LDADD = \
- maths/sparse/libsparse.a \
- misc/libmisc.a
-
-## makeidx:
-
-makeidx_SOURCES = makeidx.c
-
-makeidx_LDADD = \
- misc/libmisc.a
-
-## create index for online help:
-
-all:
- ./makeidx $(srcdir)/ngspice.txt
-
-
-## General Includes and libraries:
-
-
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/devices @X_CFLAGS@
-
-LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
-
diff -ruN ng-spice-rework-8/src/devices/Makefile.am
ng-spice-x/src/devices/Makefile.am
--- ng-spice-rework-8/src/devices/Makefile.am Sun Mar 26 12:30:43 2000
+++ ng-spice-x/src/devices/Makefile.am Mon Mar 27 21:16:54 2000
@@ -33,64 +33,5 @@
vcvs \
vsrc
-noinst_LIBRARIES = libdev.a
-
-libdev_a_SOURCES=
-
-libdev_a_LIBADD= \
- asrc/*.o \
- bjt/*.o \
- cap/*.o \
- cccs/*.o \
- ccvs/*.o \
- csw/*.o \
- devsup/*.o \
- dio/*.o \
- disto/*.o \
- ind/*.o \
- isrc/*.o \
- jfet/*.o \
- jfet2/*.o \
- ltra/*.o \
- mes/*.o \
- mos1/*.o \
- mos2/*.o \
- mos3/*.o \
- mos6/*.o \
- res/*.o \
- sw/*.o \
- tra/*.o \
- urc/*.o \
- vccs/*.o \
- vcvs/*.o \
- vsrc/*.o
-
-libdev_a_DEPENDENCIES =\
- asrc/libasrc.a \
- bjt/libbjt.a \
- cap/libcap.a \
- cccs/libcccs.a \
- ccvs/libccvs.a \
- csw/libcsw.a \
- devsup/libdevsup.a \
- dio/libdio.a \
- disto/libdisto.a \
- ind/libind.a \
- isrc/libisrc.a \
- jfet/libjfet.a \
- jfet2/libjfet2.a \
- ltra/libltra.a \
- mes/libmes.a \
- mos1/libmos1.a \
- mos2/libmos2.a \
- mos3/libmos3.a \
- mos6/libmos6.a \
- res/libres.a \
- sw/libsw.a \
- tra/libtra.a \
- urc/liburc.a \
- vccs/libvccs.a \
- vcvs/libvcvs.a \
- vsrc/libvsrc.a
MAINTAINERCLEANFILES = Makefile.in
diff -ruN ng-spice-rework-8/src/devices/Makefile.am.orig
ng-spice-x/src/devices/Makefile.am.orig
--- ng-spice-rework-8/src/devices/Makefile.am.orig Sun Mar 26 12:30:47
2000
+++ ng-spice-x/src/devices/Makefile.am.orig Thu Jan 1 01:00:00 1970
@@ -1,94 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = \
- asrc \
- bjt \
- bsim1 \
- bsim2 \
- bsim3 \
- bsim3v1 \
- bsim3v2 \
- cap \
- cccs \
- ccvs \
- csw \
- devsup \
- dio \
- disto \
- ind \
- isrc \
- jfet \
- jfet2 \
- ltra \
- mes \
- mos1 \
- mos2 \
- mos3 \
- mos6 \
- res \
- sw \
- tra \
- urc \
- vccs \
- vcvs \
- vsrc
-
-noinst_LIBRARIES = libdev.a
-
-libdev_a_SOURCES=
-
-libdev_a_LIBADD= \
- asrc/*.o \
- bjt/*.o \
- cap/*.o \
- cccs/*.o \
- ccvs/*.o \
- csw/*.o \
- devsup/*.o \
- dio/*.o \
- disto/*.o \
- ind/*.o \
- isrc/*.o \
- jfet/*.o \
- jfet2/*.o \
- ltra/*.o \
- mes/*.o \
- mos1/*.o \
- mos2/*.o \
- mos3/*.o \
- mos6/*.o \
- res/*.o \
- sw/*.o \
- tra/*.o \
- urc/*.o \
- vccs/*.o \
- vcvs/*.o \
- vsrc/*.o
-
-libdev_a_DEPENDENCIES =\
- asrc/libasrc.a \
- bjt/libbjt.a \
- cap/libcap.a \
- cccs/libcccs.a \
- ccvs/libccvs.a \
- csw/libcsw.a \
- devsup/libdevsup.a \
- dio/libdio.a \
- disto/libdisto.a \
- ind/libind.a \
- isrc/libisrc.a \
- jfet/libjfet.a \
- jfet2/libjfet2.a \
- ltra/libltra.a \
- mes/libmes.a \
- mos1/libmos1.a \
- mos2/libmos2.a \
- mos3/libmos3.a \
- mos6/libmos6.a \
- res/libres.a \
- sw/libsw.a \
- tra/libtra.a \
- urc/liburc.a \
- vccs/libvccs.a \
- vcvs/libvcvs.a \
- vsrc/libvsrc.a
diff -ruN ng-spice-rework-8/src/devices/asrc/Makefile.am
ng-spice-x/src/devices/asrc/Makefile.am
--- ng-spice-rework-8/src/devices/asrc/Makefile.am Sun Mar 26 12:30:43
2000
+++ ng-spice-x/src/devices/asrc/Makefile.am Mon Mar 27 21:23:18 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libasrc.a
+pkglib_LTLIBRARIES = libasrc.la
-libasrc_a_SOURCES = \
- asrc.c \
+libasrc_la_SOURCES = \
+ asrc.c \
asrcacld.c \
asrcask.c \
asrcconv.c \
diff -ruN ng-spice-rework-8/src/devices/bjt/Makefile.am
ng-spice-x/src/devices/bjt/Makefile.am
--- ng-spice-rework-8/src/devices/bjt/Makefile.am Sun Mar 26 12:30:43
2000
+++ ng-spice-x/src/devices/bjt/Makefile.am Mon Mar 27 21:23:16 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libbjt.a
+pkglib_LTLIBRARIES = libbjt.la
-libbjt_a_SOURCES = \
- bjt.c \
+libbjt_la_SOURCES = \
+ bjt.c \
bjtacld.c \
bjtask.c \
bjtconv.c \
diff -ruN ng-spice-rework-8/src/devices/bsim3/Makefile.am
ng-spice-x/src/devices/bsim3/Makefile.am
--- ng-spice-rework-8/src/devices/bsim3/Makefile.am Sun Mar 26 12:30:43
2000
+++ ng-spice-x/src/devices/bsim3/Makefile.am Mon Mar 27 21:02:42 2000
@@ -2,8 +2,8 @@
pkglib_LTLIBRARIES = libbsim3.la
-libbsim3_la_SOURCES = \
- b3.c \
+libbsim3_la_SOURCES = \
+ b3.c \
b3acld.c \
b3ask.c \
b3check.c \
diff -ruN ng-spice-rework-8/src/devices/bsim3v1/Makefile.in
ng-spice-x/src/devices/bsim3v1/Makefile.in
--- ng-spice-rework-8/src/devices/bsim3v1/Makefile.in Sun Mar 26 15:04:59
2000
+++ ng-spice-x/src/devices/bsim3v1/Makefile.in Mon Mar 27 23:07:20 2000
@@ -62,12 +62,10 @@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
-LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-NM = @NM@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
diff -ruN ng-spice-rework-8/src/devices/bsim3v2/Makefile.in
ng-spice-x/src/devices/bsim3v2/Makefile.in
--- ng-spice-rework-8/src/devices/bsim3v2/Makefile.in Sun Mar 26 15:05:00
2000
+++ ng-spice-x/src/devices/bsim3v2/Makefile.in Mon Mar 27 23:07:22 2000
@@ -62,12 +62,10 @@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
-LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-NM = @NM@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
diff -ruN ng-spice-rework-8/src/devices/cap/Makefile.am
ng-spice-x/src/devices/cap/Makefile.am
--- ng-spice-rework-8/src/devices/cap/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/cap/Makefile.am Mon Mar 27 21:22:58 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libcap.a
+pkglib_LTLIBRARIES = libcap.la
-libcap_a_SOURCES = \
- cap.c \
+libcap_la_SOURCES = \
+ cap.c \
capacld.c \
capask.c \
capdefs.h \
diff -ruN ng-spice-rework-8/src/devices/cccs/Makefile.am
ng-spice-x/src/devices/cccs/Makefile.am
--- ng-spice-rework-8/src/devices/cccs/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/cccs/Makefile.am Mon Mar 27 21:22:58 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libcccs.a
+pkglib_LTLIBRARIES = libcccs.la
-libcccs_a_SOURCES = \
- cccs.c \
+libcccs_la_SOURCES = \
+ cccs.c \
cccsask.c \
cccsdefs.h \
cccsdel.c \
diff -ruN ng-spice-rework-8/src/devices/ccvs/Makefile.am
ng-spice-x/src/devices/ccvs/Makefile.am
--- ng-spice-rework-8/src/devices/ccvs/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/ccvs/Makefile.am Mon Mar 27 21:22:57 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libccvs.a
+pkglib_LTLIBRARIES = libccvs.la
-libccvs_a_SOURCES = \
- ccvs.c \
+libccvs_la_SOURCES = \
+ ccvs.c \
ccvsask.c \
ccvsdefs.h \
ccvsdel.c \
diff -ruN ng-spice-rework-8/src/devices/csw/Makefile.am
ng-spice-x/src/devices/csw/Makefile.am
--- ng-spice-rework-8/src/devices/csw/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/csw/Makefile.am Mon Mar 27 21:22:57 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libcsw.a
+pkglib_LTLIBRARIES = libcsw.la
-libcsw_a_SOURCES = \
- csw.c \
+libcsw_la_SOURCES = \
+ csw.c \
cswacld.c \
cswask.c \
cswdefs.h \
diff -ruN ng-spice-rework-8/src/devices/devsup/Makefile.am
ng-spice-x/src/devices/devsup/Makefile.am
--- ng-spice-rework-8/src/devices/devsup/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/devsup/Makefile.am Mon Mar 27 21:22:56 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libdevsup.a
+pkglib_LTLIBRARIES = libdevsup.la
-libdevsup_a_SOURCES = devsup.c
+libdevsup_la_SOURCES = devsup.c
diff -ruN ng-spice-rework-8/src/devices/dio/Makefile.am
ng-spice-x/src/devices/dio/Makefile.am
--- ng-spice-rework-8/src/devices/dio/Makefile.am Sun Mar 26 12:30:44
2000
+++ ng-spice-x/src/devices/dio/Makefile.am Mon Mar 27 21:22:55 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libdio.a
+pkglib_LTLIBRARIES = libdio.la
-libdio_a_SOURCES = \
- dio.c \
+libdio_la_SOURCES = \
+ dio.c \
dioacld.c \
dioask.c \
dioconv.c \
diff -ruN ng-spice-rework-8/src/devices/disto/Makefile.am
ng-spice-x/src/devices/disto/Makefile.am
--- ng-spice-rework-8/src/devices/disto/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/disto/Makefile.am Mon Mar 27 21:22:55 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libdisto.a
+pkglib_LTLIBRARIES = libdisto.la
-libdisto_a_SOURCES = \
+libdisto_la_SOURCES = \
atander.c \
cosderiv.c \
cubeder.c \
diff -ruN ng-spice-rework-8/src/devices/ind/Makefile.am
ng-spice-x/src/devices/ind/Makefile.am
--- ng-spice-rework-8/src/devices/ind/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/ind/Makefile.am Mon Mar 27 21:22:54 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libind.a
+pkglib_LTLIBRARIES = libind.la
-libind_a_SOURCES = \
- ind.c \
+libind_la_SOURCES = \
+ ind.c \
indacld.c \
indask.c \
inddefs.h \
diff -ruN ng-spice-rework-8/src/devices/isrc/Makefile.am
ng-spice-x/src/devices/isrc/Makefile.am
--- ng-spice-rework-8/src/devices/isrc/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/isrc/Makefile.am Mon Mar 27 21:22:54 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libisrc.a
+pkglib_LTLIBRARIES = libisrc.la
-libisrc_a_SOURCES = \
- isrc.c \
+libisrc_la_SOURCES = \
+ isrc.c \
isrcacct.c \
isrcacld.c \
isrcask.c \
diff -ruN ng-spice-rework-8/src/devices/jfet/Makefile.am
ng-spice-x/src/devices/jfet/Makefile.am
--- ng-spice-rework-8/src/devices/jfet/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/jfet/Makefile.am Mon Mar 27 21:22:53 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libjfet.a
+pkglib_LTLIBRARIES = libjfet.la
-libjfet_a_SOURCES = \
- jfet.c \
+libjfet_la_SOURCES = \
+ jfet.c \
jfetacld.c \
jfetask.c \
jfetdefs.h \
diff -ruN ng-spice-rework-8/src/devices/jfet2/Makefile.am
ng-spice-x/src/devices/jfet2/Makefile.am
--- ng-spice-rework-8/src/devices/jfet2/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/jfet2/Makefile.am Mon Mar 27 21:22:53 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libjfet2.a
+pkglib_LTLIBRARIES = libjfet2.la
-libjfet2_a_SOURCES = \
+libjfet2_la_SOURCES = \
jfet2.c \
jfet2acld.c \
jfet2ask.c \
diff -ruN ng-spice-rework-8/src/devices/ltra/Makefile.am
ng-spice-x/src/devices/ltra/Makefile.am
--- ng-spice-rework-8/src/devices/ltra/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/ltra/Makefile.am Mon Mar 27 21:22:52 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libltra.a
+pkglib_LTLIBRARIES = libltra.la
-libltra_a_SOURCES = \
+libltra_la_SOURCES = \
ltra.c \
ltraacct.c \
ltraacld.c \
diff -ruN ng-spice-rework-8/src/devices/mes/Makefile.am
ng-spice-x/src/devices/mes/Makefile.am
--- ng-spice-rework-8/src/devices/mes/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/mes/Makefile.am Mon Mar 27 21:22:52 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libmes.a
+pkglib_LTLIBRARIES = libmes.la
-libmes_a_SOURCES = \
- mes.c \
+libmes_la_SOURCES = \
+ mes.c \
mesacl.c \
mesask.c \
mesdefs.h \
diff -ruN ng-spice-rework-8/src/devices/mos1/Makefile.am
ng-spice-x/src/devices/mos1/Makefile.am
--- ng-spice-rework-8/src/devices/mos1/Makefile.am Sun Mar 26 12:30:45
2000
+++ ng-spice-x/src/devices/mos1/Makefile.am Mon Mar 27 23:05:58 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libmos1.a
+pkglib_LTLIBRARIES = libmos1.la
-libmos1_a_SOURCES = \
- mos1.c \
+libmos1_la_SOURCES = \
+ mos1.c \
mos1acld.c \
mos1ask.c \
mos1conv.c \
diff -ruN ng-spice-rework-8/src/devices/mos2/Makefile.am
ng-spice-x/src/devices/mos2/Makefile.am
--- ng-spice-rework-8/src/devices/mos2/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/mos2/Makefile.am Mon Mar 27 21:22:51 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libmos2.a
+pkglib_LTLIBRARIES = libmos2.la
-libmos2_a_SOURCES = \
- mos2.c \
+libmos2_la_SOURCES = \
+ mos2.c \
mos2acld.c \
mos2ask.c \
mos2conv.c \
diff -ruN ng-spice-rework-8/src/devices/mos3/Makefile.am
ng-spice-x/src/devices/mos3/Makefile.am
--- ng-spice-rework-8/src/devices/mos3/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/mos3/Makefile.am Mon Mar 27 21:22:50 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libmos3.a
+pkglib_LTLIBRARIES = libmos3.la
-libmos3_a_SOURCES = \
- mos3.c \
+libmos3_la_SOURCES = \
+ mos3.c \
mos3acld.c \
mos3ask.c \
mos3conv.c \
diff -ruN ng-spice-rework-8/src/devices/mos6/Makefile.am
ng-spice-x/src/devices/mos6/Makefile.am
--- ng-spice-rework-8/src/devices/mos6/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/mos6/Makefile.am Mon Mar 27 21:22:49 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libmos6.a
+pkglib_LTLIBRARIES = libmos6.la
-libmos6_a_SOURCES = \
- mos6.c \
+libmos6_la_SOURCES = \
+ mos6.c \
mos6ask.c \
mos6conv.c \
mos6defs.h \
diff -ruN ng-spice-rework-8/src/devices/res/Makefile.am
ng-spice-x/src/devices/res/Makefile.am
--- ng-spice-rework-8/src/devices/res/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/res/Makefile.am Mon Mar 27 21:22:49 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libres.a
+pkglib_LTLIBRARIES = libres.la
-libres_a_SOURCES = \
- res.c \
+libres_la_SOURCES = \
+ res.c \
resask.c \
resdefs.h \
resdel.c \
diff -ruN ng-spice-rework-8/src/devices/sw/Makefile.am
ng-spice-x/src/devices/sw/Makefile.am
--- ng-spice-rework-8/src/devices/sw/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/sw/Makefile.am Mon Mar 27 21:22:48 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libsw.a
+pkglib_LTLIBRARIES = libsw.la
-libsw_a_SOURCES = \
- sw.c \
+libsw_la_SOURCES = \
+ sw.c \
swacload.c \
swask.c \
swdefs.h \
diff -ruN ng-spice-rework-8/src/devices/tra/Makefile.am
ng-spice-x/src/devices/tra/Makefile.am
--- ng-spice-rework-8/src/devices/tra/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/tra/Makefile.am Mon Mar 27 21:22:48 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libtra.a
+pkglib_LTLIBRARIES = libtra.la
-libtra_a_SOURCES = \
- tra.c \
+libtra_la_SOURCES = \
+ tra.c \
traacct.c \
traacld.c \
traask.c \
diff -ruN ng-spice-rework-8/src/devices/urc/Makefile.am
ng-spice-x/src/devices/urc/Makefile.am
--- ng-spice-rework-8/src/devices/urc/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/urc/Makefile.am Mon Mar 27 21:22:47 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = liburc.a
+pkglib_LTLIBRARIES = liburc.la
-liburc_a_SOURCES = \
- urc.c \
+liburc_la_SOURCES = \
+ urc.c \
urcask.c \
urcdefs.h \
urcdel.c \
diff -ruN ng-spice-rework-8/src/devices/vccs/Makefile.am
ng-spice-x/src/devices/vccs/Makefile.am
--- ng-spice-rework-8/src/devices/vccs/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/vccs/Makefile.am Mon Mar 27 21:22:46 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libvccs.a
+pkglib_LTLIBRARIES = libvccs.la
-libvccs_a_SOURCES = \
+libvccs_la_SOURCES = \
vccs.c \
vccsask.c \
vccsdefs.h \
diff -ruN ng-spice-rework-8/src/devices/vcvs/Makefile.am
ng-spice-x/src/devices/vcvs/Makefile.am
--- ng-spice-rework-8/src/devices/vcvs/Makefile.am Sun Mar 26 12:30:46
2000
+++ ng-spice-x/src/devices/vcvs/Makefile.am Mon Mar 27 21:22:41 2000
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libvcvs.a
+pkglib_LTLIBRARIES = libvcvs.la
-libvcvs_a_SOURCES = \
- vcvs.c \
+libvcvs_la_SOURCES = \
+ vcvs.c \
vcvsask.c \
vcvsdefs.h \
vcvsdel.c \
diff -ruN ng-spice-rework-8/src/devices/vsrc/Makefile.am
ng-spice-x/src/devices/vsrc/Makefile.am
--- ng-spice-rework-8/src/devices/vsrc/Makefile.am Sun Mar 26 12:30:47
2000
+++ ng-spice-x/src/devices/vsrc/Makefile.am Mon Mar 27 21:03:25 2000
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libvsrc.a
+pkglib_LTLIBRARIES = libvsrc.la
-libvsrc_a_SOURCES = \
+libvsrc_la_SOURCES = \
vsrc.c \
vsrcacct.c \
vsrcacld.c \
diff -ruN ng-spice-rework-8/src/include/ngspice.h~
ng-spice-x/src/include/ngspice.h~
--- ng-spice-rework-8/src/include/ngspice.h~ Sun Mar 26 12:30:52 2000
+++ ng-spice-x/src/include/ngspice.h~ Thu Jan 1 01:00:00 1970
@@ -1,155 +0,0 @@
-/*************
- * Main header file for ngspice
- * 1999 E. Rouat
- ************/
-
-/*
- * This file will eventually replace spice.h and lots of other
- * files in src/include
- */
-
-
-#include <config.h>
-#include <math.h>
-#include <stdio.h>
-
-
-
-#include "defines.h"
-#include "macros.h"
-
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#else
-# ifdef HAVE_SGTTY_H
-# include <sgtty.h>
-# else
-# ifdef HAVE_TERMIO_H
-# include <termio.h>
-# endif
-# endif
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef HAVE_SYS_DIR_H
-#include <sys/types.h>
-#include <sys/dir.h>
-#else
-# ifdef HAVE_DIRENT_H
-# include <sys/types.h>
-# include <dirent.h>
-# ifndef direct
-# define direct dirent
-# endif
-# endif
-#endif
-
-#ifdef HAVE_GETRLIMIT
-# include <sys/time.h>
-# include <sys/resource.h>
-#endif
-#ifdef HAVE_GETRUSAGE
-# ifndef HAVE_GETRLIMIT
-# include <sys/time.h>
-# include <sys/resource.h>
-# endif
-#else
-# ifdef HAVE_TIMES
-# include <sys/times.h>
-# include <sys/param.h>
-# else
-# ifdef HAVE_FTIME
-# include <sys/timeb.h>
-struct timeb timebegin;
-# endif
-# endif
-#endif
-
-#ifdef HAVE_INDEX
-# define strchr index
-# define strrchr rindex
-#endif
-
-#ifdef HAS_TIME_
-# ifdef HAVE_GETTIMEOFDAY
-/* extern char *timezone(); */ /* never used ? (ER) */
-# endif
-extern char *asctime();
-extern struct tm *localtime();
-#endif
-
-extern char *sbrk();
-
-
-
-/* Functions declarations from src/misc/[].c */
-
-extern void *tmalloc(size_t num);
-extern void *trealloc(void *str, size_t num);
-extern void txfree(void *ptr);
-
-extern char *gettok(char **s);
-extern void appendc(char *s, char c);
-extern int scannum(char *str);
-extern int ciprefix(register char *p, register char *s);
-extern int cieq(register char *p, register char *s);
-extern void strtolower(char *str);
-extern char *tilde_expand(char *string);
-
-extern char *smktemp(char *id);
-
-extern char *copy();
-extern int prefix();
-extern int substring();
-extern void cp_printword();
-
-extern char *datestring();
-extern double seconds(void);
-
-/* Some external variables */
-
-extern char *Spice_Exec_Dir;
-extern char *Spice_Lib_Dir;
-extern char Spice_OptChar;
-extern char *Def_Editor;
-extern char *Bug_Addr;
-extern int AsciiRawFile;
-extern char *Spice_Host;
-extern char *Spiced_Log;
-
-extern char Spice_Notice[ ];
-extern char Spice_Version[ ];
-extern char Spice_Build_Date[ ];
-
-extern char *News_File;
-extern char *Default_MFB_Cap;
-extern char *Spice_Path;
-extern char *Help_Path;
-extern char *Lib_Path;
-
-extern int ARCHme; /* My logical process number */
-extern int ARCHsize; /* Total number of processes */
PGP signature
Partial thread listing: