diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 8781b8610..c4ffb4b55 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -134,6 +134,7 @@ libfte_la_SOURCES = \ inpcom.h \ inpcompat.c \ inpcompat.h \ + inpdeg.c \ inpc_probe.c \ interp.c \ interp.h \ diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 61304108d..124e637ec 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -110,6 +110,8 @@ struct func_temper extern void line_free_x(struct card *deck, bool recurse); +extern int readdegparams(struct card* deck); + /* Collect information for dynamic allocation of numparam arrays */ /* number of lines in input deck */ int dynmaxline; /* inpcom.c 1529 */ diff --git a/src/xspice/cm/cm.c b/src/xspice/cm/cm.c index 18e3bd0d1..7f80889a5 100644 --- a/src/xspice/cm/cm.c +++ b/src/xspice/cm/cm.c @@ -63,11 +63,9 @@ NON-STANDARD FEATURES #include "ngspice/cktdefs.h" #include "ngspice/cpextern.h" //#include "util.h" + extern struct agemod agemods; - - - static void cm_static_integrate(int byte_index, double integrand, double *integral, diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in index d26ed30b8..0ae18797e 100644 --- a/src/xspice/icm/GNUmakefile.in +++ b/src/xspice/icm/GNUmakefile.in @@ -11,7 +11,7 @@ CMDIRS = spice2poly digital analog xtradev xtraevt table tlines #Invoke $(MAKE) for each of the CMDDIRS -all: dstring.o msline_common.o tline_common.o# Common object files for all code modules +all: dstring.o hash.o msline_common.o tline_common.o# Common object files for all code modules for cm in $(CMDIRS) ; do \ $(MAKE) cm=$$cm $$cm/$$cm.cm \ || exit 1; \ @@ -36,6 +36,7 @@ uninstall: clean: rm -f dstring.o + rm -f hash.o rm -f msline_common.o rm -f tline_common.o for cm in $(CMDIRS) ; do \ @@ -51,6 +52,9 @@ NGSRCBUILDDIR = $(CURDIR)/../.. dstring.o: $(NGSRCDIR)/misc/dstring.c $(NGSRCDIR)/include/ngspice/dstring.h $(CC) $(CFLAGS) -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $< +hash.o: $(NGSRCDIR)/misc/hash.c $(NGSRCDIR)/include/ngspice/hash.h + $(CC) $(CFLAGS) -DXSPICECM -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $< + msline_common.o: $(srcdir)/../tlines/msline_common.c $(srcdir)/../tlines/msline_common.h $(CC) $(CFLAGS) -I$(srcdir)/../tlines -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $< @@ -78,6 +82,7 @@ cm-gens := \ cm-objs := \ $(cm)/dlmain.o \ dstring.o \ + hash.o \ tline_common.o \ msline_common.o \ $(modlst:%=$(cm)/%/cfunc.o) \