From 68b2e6b23a30f5b177430f798208cff8aac5b020 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 17 Sep 2010 16:11:25 +0000 Subject: [PATCH] whitespace cleanup (all Makefile.am files) --- ChangeLog | 4 + Makefile.am | 8 +- doc/Makefile.am | 2 +- src/Makefile.am | 20 ++-- src/ciderlib/input/Makefile.am | 4 +- src/ciderlib/oned/Makefile.am | 4 +- src/ciderlib/support/Makefile.am | 2 +- src/ciderlib/twod/Makefile.am | 4 +- src/frontend/Makefile.am | 28 ++--- src/frontend/help/Makefile.am | 8 +- src/frontend/numparam/Makefile.am | 2 +- src/frontend/plotting/Makefile.am | 4 +- src/frontend/wdisp/Makefile.am | 4 +- src/include/Makefile.am | 108 +++++++++---------- src/maths/cmaths/Makefile.am | 10 +- src/maths/deriv/Makefile.am | 2 +- src/maths/misc/Makefile.am | 8 +- src/misc/Makefile.am | 2 +- src/spicelib/analysis/Makefile.am | 2 +- src/spicelib/devices/Makefile.am | 38 +++---- src/spicelib/devices/asrc/Makefile.am | 2 +- src/spicelib/devices/bjt/Makefile.am | 2 +- src/spicelib/devices/bjt2/Makefile.am | 12 +-- src/spicelib/devices/bsim1/Makefile.am | 2 +- src/spicelib/devices/bsim2/Makefile.am | 2 +- src/spicelib/devices/bsim3/Makefile.am | 2 +- src/spicelib/devices/bsim3soi/Makefile.am | 4 +- src/spicelib/devices/bsim3soi_dd/Makefile.am | 2 +- src/spicelib/devices/bsim3soi_fd/Makefile.am | 2 +- src/spicelib/devices/bsim3soi_pd/Makefile.am | 2 +- src/spicelib/devices/bsim3v32/Makefile.am | 14 +-- src/spicelib/devices/bsim4/Makefile.am | 2 +- src/spicelib/devices/bsim4v2/Makefile.am | 16 +-- src/spicelib/devices/bsim4v4/Makefile.am | 16 +-- src/spicelib/devices/bsim4v5/Makefile.am | 16 +-- src/spicelib/devices/cap/Makefile.am | 2 +- src/spicelib/devices/cccs/Makefile.am | 2 +- src/spicelib/devices/ccvs/Makefile.am | 2 +- src/spicelib/devices/cpl/Makefile.am | 6 +- src/spicelib/devices/csw/Makefile.am | 6 +- src/spicelib/devices/dio/Makefile.am | 2 +- src/spicelib/devices/hfet1/Makefile.am | 2 +- src/spicelib/devices/hfet2/Makefile.am | 2 +- src/spicelib/devices/hisim/Makefile.am | 36 +++---- src/spicelib/devices/ind/Makefile.am | 2 +- src/spicelib/devices/isrc/Makefile.am | 2 +- src/spicelib/devices/jfet/Makefile.am | 2 +- src/spicelib/devices/jfet2/Makefile.am | 2 +- src/spicelib/devices/ltra/Makefile.am | 2 +- src/spicelib/devices/mes/Makefile.am | 2 +- src/spicelib/devices/mesa/Makefile.am | 2 +- src/spicelib/devices/mos1/Makefile.am | 2 +- src/spicelib/devices/mos2/Makefile.am | 2 +- src/spicelib/devices/mos3/Makefile.am | 2 +- src/spicelib/devices/mos6/Makefile.am | 2 +- src/spicelib/devices/mos9/Makefile.am | 2 +- src/spicelib/devices/nbjt/Makefile.am | 4 +- src/spicelib/devices/nbjt2/Makefile.am | 4 +- src/spicelib/devices/ndev/Makefile.am | 4 +- src/spicelib/devices/numd/Makefile.am | 4 +- src/spicelib/devices/numd2/Makefile.am | 4 +- src/spicelib/devices/numos/Makefile.am | 4 +- src/spicelib/devices/res/Makefile.am | 2 +- src/spicelib/devices/soi3/Makefile.am | 2 +- src/spicelib/devices/sw/Makefile.am | 4 +- src/spicelib/devices/tra/Makefile.am | 2 +- src/spicelib/devices/txl/Makefile.am | 4 +- src/spicelib/devices/urc/Makefile.am | 2 +- src/spicelib/devices/vbic/Makefile.am | 2 +- src/spicelib/devices/vccs/Makefile.am | 2 +- src/spicelib/devices/vcvs/Makefile.am | 2 +- src/spicelib/devices/vsrc/Makefile.am | 2 +- src/spicelib/parser/Makefile.am | 8 +- src/xspice/cm/Makefile.am | 10 +- src/xspice/enh/Makefile.am | 4 +- src/xspice/evt/Makefile.am | 32 +++--- src/xspice/ipc/Makefile.am | 10 +- tests/Makefile.am | 8 +- tests/bsim1/Makefile.am | 2 +- tests/bsim2/Makefile.am | 2 +- tests/bsim3/ac_sim/Makefile.am | 6 +- tests/bsim3/dc_sim/Makefile.am | 2 +- tests/bsim3/tran_sim/Makefile.am | 2 +- tests/bsim3soidd/Makefile.am | 6 +- tests/bsim3soifd/Makefile.am | 6 +- tests/bsim3soipd/Makefile.am | 6 +- tests/filters/Makefile.am | 2 +- tests/general/Makefile.am | 4 +- tests/hfet/Makefile.am | 2 +- tests/hisim/Makefile.am | 2 +- tests/jfet/Makefile.am | 2 +- tests/mes/Makefile.am | 2 +- tests/mesa/Makefile.am | 4 +- tests/mos6/Makefile.am | 2 +- tests/polezero/Makefile.am | 2 +- tests/resistance/Makefile.am | 2 +- tests/sensitivity/Makefile.am | 2 +- tests/transient/Makefile.am | 2 +- tests/transmission/Makefile.am | 12 +-- tests/vbic/Makefile.am | 10 +- xgraph/Makefile.am | 6 +- 101 files changed, 328 insertions(+), 324 deletions(-) diff --git a/ChangeLog b/ChangeLog index 345684fe8..9082d8c41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-09-17 Robert Larice + * **/Makefile.am : + whitespace cleanup + 2010-09-15 Holger Vogt * com_measure2.c: prevent seg fault in meas ac, if real input * examples/control_structs/MonteCarlo.sp: update, add measure diff --git a/Makefile.am b/Makefile.am index e396ae7ba..ced19a645 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,8 +14,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ missing mkinstalldirs stamp-h.in ltconfig \ ltmain.sh autom4te.cache -ACLOCAL_AMFLAGS = -I m4 - +ACLOCAL_AMFLAGS = -I m4 + dist-hook: rm -rf `find $(distdir)/contrib -name CVS` rm -rf `find $(distdir)/patches -name CVS` @@ -28,11 +28,11 @@ dist-hook: rm -rf `find $(distdir)/xgraph -name config.status` rm -rf `find $(distdir)/xgraph -name config.log` rm -rf `find $(distdir)/xgraph -name aclocal.m4` - rm -rf `find $(distdir)/xgraph -name Makefile` + rm -rf `find $(distdir)/xgraph -name Makefile` rm -rf `find $(distdir)/xgraph/bitmaps -name CVS` rm -rf `find $(distdir)/xgraph/examples -name CVS` rm -rf `find $(distdir)/unsupported -name CVS` - + mrproper: maintainer-clean rm -f `find . -type f -name "*~" -print` rm -f `find . -type f -name "*.orig" -print` diff --git a/doc/Makefile.am b/doc/Makefile.am index 8c57d9047..a5c9adad8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = ngspice.ps ngspice.pdf info_TEXINFOS = ngspice.texi -CLEANFILES = *.fns *.pg *.tp *.aux *.cp *.ky *.vr *.fn *.log *.toc *.vrs +CLEANFILES = *.fns *.pg *.tp *.aux *.cp *.ky *.vr *.fn *.log *.toc *.vrs DISTCLEANFILES = $(CLEANFILES) *.ps *.dvi *.info* diff --git a/src/Makefile.am b/src/Makefile.am index 9bd73814e..ff28cd4f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ initdatadir = $(pkgdatadir)/scripts initdata_DATA = spinit setplot spectrum @CIDERSCRIPTS@ -DYNAMIC_DEVICELIBS = \ +DYNAMIC_DEVICELIBS = \ spicelib/devices/asrc/libasrc.la \ spicelib/devices/bjt/libbjt.la \ spicelib/devices/bjt2/libbjt2.la \ @@ -47,7 +47,7 @@ DYNAMIC_DEVICELIBS = \ spicelib/devices/cap/libcap.la \ spicelib/devices/bsim3soi/libbsim4soi.la \ spicelib/devices/bsim3soi_pd/libbsim3soipd.la \ - spicelib/devices/bsim3soi_fd/libbsim3soifd.la \ + spicelib/devices/bsim3soi_fd/libbsim3soifd.la \ spicelib/devices/bsim3soi_dd/libbsim3soidd.la \ spicelib/devices/cccs/libcccs.la \ spicelib/devices/ccvs/libccvs.la \ @@ -63,7 +63,7 @@ DYNAMIC_DEVICELIBS = \ spicelib/devices/jfet2/libjfet2.la \ spicelib/devices/ltra/libltra.la \ spicelib/devices/mes/libmes.la \ - spicelib/devices/mesa/libmesa.la \ + spicelib/devices/mesa/libmesa.la \ spicelib/devices/mos1/libmos1.la \ spicelib/devices/mos2/libmos2.la \ spicelib/devices/mos3/libmos3.la \ @@ -80,7 +80,7 @@ DYNAMIC_DEVICELIBS = \ spicelib/devices/vcvs/libvcvs.la \ spicelib/devices/vsrc/libvsrc.la \ @NDEV_LIB@ \ - @VLADEV@ \ + @VLADEV@ \ @NUMDEV@ @@ -105,11 +105,11 @@ ngspice_LDADD = \ $(DYNAMIC_DEVICELIBS) \ spicelib/analysis/libckt.la \ spicelib/devices/libdev.la \ - @XSPICELIB2@ \ + @XSPICELIB2@ \ frontend/parser/libparser.la \ frontend/numparam/libnumparam.la \ spicelib/parser/libinp.la \ - @CIDERSIM@ \ + @CIDERSIM@ \ maths/deriv/libderiv.la \ maths/cmaths/libcmaths.la \ maths/misc/libmathmisc.la \ @@ -193,7 +193,7 @@ ngsconvert_LDADD = \ maths/misc/libmathmisc.la \ misc/libmisc.la - + ## proc2mod: ngproc2mod_SOURCES = ngproc2mod.c @@ -261,11 +261,11 @@ libspice_la_LIBADD = ngspice.lo conf.lo \ $(DYNAMIC_DEVICELIBS) \ spicelib/analysis/libckt.la \ spicelib/devices/libdev.la \ - @XSPICELIB2@ \ + @XSPICELIB2@ \ frontend/parser/libparser.la \ - frontend/numparam/libnumparam.la \ + frontend/numparam/libnumparam.la \ spicelib/parser/libinp.la \ - @CIDERSIM@ \ + @CIDERSIM@ \ maths/deriv/libderiv.la \ maths/cmaths/libcmaths.la \ maths/misc/libmathmisc.la \ diff --git a/src/ciderlib/input/Makefile.am b/src/ciderlib/input/Makefile.am index 0a476517d..b47956803 100644 --- a/src/ciderlib/input/Makefile.am +++ b/src/ciderlib/input/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libciderinput.la -libciderinput_la_SOURCES = \ +libciderinput_la_SOURCES = \ bdryset.c \ boundary.c \ cards.c \ @@ -25,7 +25,7 @@ libciderinput_la_SOURCES = \ modlset.c \ optionsc.c \ outpset.c \ - output.c + output.c EXTRA_DIST = readme diff --git a/src/ciderlib/oned/Makefile.am b/src/ciderlib/oned/Makefile.am index 673d5c3fb..5c983e4c4 100644 --- a/src/ciderlib/oned/Makefile.am +++ b/src/ciderlib/oned/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcideroned.la -libcideroned_la_SOURCES = \ +libcideroned_la_SOURCES = \ oneadmit.c \ oneaval.c \ onecond.c \ @@ -18,7 +18,7 @@ libcideroned_la_SOURCES = \ oneproj.c \ oneread.c \ onesetup.c \ - onesolve.c + onesolve.c EXTRA_DIST = notes readme AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/ciderlib/support/Makefile.am b/src/ciderlib/support/Makefile.am index 6a0384e1e..effee43d9 100644 --- a/src/ciderlib/support/Makefile.am +++ b/src/ciderlib/support/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcidersuprt.la -libcidersuprt_la_SOURCES = \ +libcidersuprt_la_SOURCES = \ database.c \ devprint.c \ geominfo.c \ diff --git a/src/ciderlib/twod/Makefile.am b/src/ciderlib/twod/Makefile.am index 6e103f10c..5848f98a3 100644 --- a/src/ciderlib/twod/Makefile.am +++ b/src/ciderlib/twod/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcidertwod.la -libcidertwod_la_SOURCES = \ +libcidertwod_la_SOURCES = \ twoadmit.c \ twoaval.c \ twocond.c \ @@ -26,7 +26,7 @@ libcidertwod_la_SOURCES = \ tworead.c \ twosetbc.c \ twosetup.c \ - twosolve.c + twosolve.c EXTRA_DIST = readme AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 641fec35f..158f33f93 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST += parse-bison.c parse-bison.h noinst_LTLIBRARIES = libfte.la -libfte_la_SOURCES = \ +libfte_la_SOURCES = \ com_measure2.c \ com_measure2.h \ commands.c \ @@ -18,8 +18,8 @@ libfte_la_SOURCES = \ com_ahelp.h \ com_alias.c \ com_alias.h \ - com_asciiplot.c \ - com_asciiplot.h \ + com_asciiplot.c \ + com_asciiplot.h \ com_cdump.c \ com_cdump.h \ com_chdir.c \ @@ -64,9 +64,9 @@ libfte_la_SOURCES = \ com_fft.h \ com_state.c \ com_state.h \ - com_strcmp.c \ - com_strcmp.h \ - com_sysinfo.c \ + com_strcmp.c \ + com_strcmp.h \ + com_sysinfo.c \ com_unset.c \ com_unset.h \ com_xgraph.c \ @@ -87,7 +87,7 @@ libfte_la_SOURCES = \ terminal.h \ variable.c \ variable.h \ - \ + \ arg.c \ arg.h \ aspice.c \ @@ -130,7 +130,7 @@ libfte_la_SOURCES = \ interp.h \ linear.c \ linear.h \ - measure.c \ + measure.c \ misccoms.c \ misccoms.h \ miscvars.c \ @@ -165,8 +165,8 @@ libfte_la_SOURCES = \ runcoms2.h \ shyu.c \ shyu.h \ - signal_handler.c\ - signal_handler.h\ + signal_handler.c \ + signal_handler.h \ spec.c \ spec.h \ spiceif.c \ @@ -178,16 +178,16 @@ libfte_la_SOURCES = \ vectors.c \ vectors.h \ where.c \ - where.h + where.h # TESTS = testcommands -# +# # bin_PROGRAMS = testcommands -# +# # testcommands_SOURCES = \ # testcommands.c \ # testcommands.h -# +# # testcommands_LDADD = libfte.a plotting/libplotting.a ../misc/libmisc.a diff --git a/src/frontend/help/Makefile.am b/src/frontend/help/Makefile.am index 79ed0d95b..1263c418f 100644 --- a/src/frontend/help/Makefile.am +++ b/src/frontend/help/Makefile.am @@ -5,17 +5,17 @@ if !NO_X noinst_LTLIBRARIES = libhlp.la libhlp_la_SOURCES = \ - help.c \ + help.c \ provide.c \ readhelp.c \ textdisp.c \ - xdisplay.c \ - x11disp.c + xdisplay.c \ + x11disp.c AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@ -endif +endif MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/numparam/Makefile.am b/src/frontend/numparam/Makefile.am index a215afc23..46876c6b4 100644 --- a/src/frontend/numparam/Makefile.am +++ b/src/frontend/numparam/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = downgrad.txt ngconfig.sh readme.txt nupatest.c washprog.c noinst_LTLIBRARIES = libnumparam.la -libnumparam_la_SOURCES = \ +libnumparam_la_SOURCES = \ spicenum.c \ xpressn.c \ mystring.c \ diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am index 12da03853..ed7df9c91 100644 --- a/src/frontend/plotting/Makefile.am +++ b/src/frontend/plotting/Makefile.am @@ -22,7 +22,7 @@ libplotting_la_SOURCES = \ plotcurv.c \ plotcurv.h \ plotit.c \ - plotit.h + plotit.h if !NO_X libplotting_la_SOURCES += \ @@ -32,6 +32,6 @@ libplotting_la_SOURCES += \ xgraph.h endif -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@ MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/wdisp/Makefile.am b/src/frontend/wdisp/Makefile.am index 9b110432c..47d3d3e6f 100644 --- a/src/frontend/wdisp/Makefile.am +++ b/src/frontend/wdisp/Makefile.am @@ -9,8 +9,8 @@ libwindisp_la_SOURCES = \ winprint.c \ winprint.h \ ftegraf.h - - + + AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp MAINTAINERCLEANFILES = Makefile.in diff --git a/src/include/Makefile.am b/src/include/Makefile.am index d24d0a2c0..3eab8fa82 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -1,66 +1,66 @@ ## Process this file with automake to produce Makefile.in ## $Id$ -noinst_HEADERS = \ +noinst_HEADERS = \ tclspice.h \ - acdefs.h \ + acdefs.h \ bdrydefs.h \ - bool.h \ + bool.h \ carddefs.h \ ciderinp.h \ cidersupt.h \ - cktdefs.h \ + cktdefs.h \ cluster.h \ cmconstants.h \ cm.h \ cmproto.h \ cmtypes.h \ compatmode.h \ - complex.h \ - const.h \ + complex.h \ + const.h \ contdefs.h \ - cpdefs.h \ - cpextern.h \ - cpstd.h \ - defines.h \ - devdefs.h \ - dgen.h \ - distodef.h \ + cpdefs.h \ + cpextern.h \ + cpstd.h \ + defines.h \ + devdefs.h \ + dgen.h \ + distodef.h \ dllitf.h \ domndefs.h \ dopdefs.h \ dstring.h \ - dvec.h \ + dvec.h \ elctdefs.h \ enh.h \ evt.h \ evtproto.h \ evtudn.h \ - ftedbgra.h \ - ftedebug.h \ - ftedefs.h \ - ftedev.h \ - fteext.h \ - fteinp.h \ - fteinput.h \ - fteparse.h \ - gendefs.h \ + ftedbgra.h \ + ftedebug.h \ + ftedefs.h \ + ftedev.h \ + fteext.h \ + fteinp.h \ + fteinput.h \ + fteparse.h \ + gendefs.h \ gendev.h \ - graph.h \ - grid.h \ - hash.h \ - hlpdefs.h \ - iferrmsg.h \ - ifsim.h \ - inpdefs.h \ - inpmacs.h \ - inpptree.h \ + graph.h \ + grid.h \ + hash.h \ + hlpdefs.h \ + iferrmsg.h \ + ifsim.h \ + inpdefs.h \ + inpmacs.h \ + inpptree.h \ ipc.h \ ipcproto.h \ ipctiein.h \ - jobdefs.h \ + jobdefs.h \ lsort.h \ - macros.h \ + macros.h \ material.h \ matldefs.h \ memory.h \ @@ -73,12 +73,12 @@ noinst_HEADERS = \ mifparse.h \ mifproto.h \ miftypes.h \ - missing_math.h \ + missing_math.h \ mobdefs.h \ modldefs.h \ multi_line.h \ - ngspice.h \ - noisedef.h \ + ngspice.h \ + noisedef.h \ numcards.h \ numconst.h \ numenum.h \ @@ -86,27 +86,27 @@ noinst_HEADERS = \ numglobs.h \ onedev.h \ onemesh.h \ - opdefs.h \ - optdefs.h \ + opdefs.h \ + optdefs.h \ optndefs.h \ outpdefs.h \ - plot.h \ - pnode.h \ + plot.h \ + pnode.h \ profile.h \ - pzdefs.h \ - sen2defs.h \ - sensdefs.h \ - sensgen.h \ - sim.h \ - smpdefs.h \ - sperror.h \ - spmatrix.h \ - suffix.h \ + pzdefs.h \ + sen2defs.h \ + sensdefs.h \ + sensgen.h \ + sim.h \ + smpdefs.h \ + sperror.h \ + spmatrix.h \ + suffix.h \ swec.h \ - tfdefs.h \ - trandefs.h \ - trcvdefs.h \ - tskdefs.h \ + tfdefs.h \ + trandefs.h \ + trcvdefs.h \ + tskdefs.h \ twodev.h \ twomesh.h \ wordlist.h \ diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am index ab609b386..afdb6a20b 100644 --- a/src/maths/cmaths/Makefile.am +++ b/src/maths/cmaths/Makefile.am @@ -15,17 +15,17 @@ libcmaths_la_SOURCES = \ ## Test programs fail to build on Windows if !WINDOWS -if !TCLWIN +if !TCLWIN noinst_PROGRAMS = test_cx_mag test_cx_j test_cx_ph - + test_cx_ph_SOURCES = \ test_cx_ph.c test_cx_ph_LDADD = \ libcmaths.la \ ../../misc/libmisc.la \ - $(TCL_LIB_SPEC) + $(TCL_LIB_SPEC) test_cx_mag_SOURCES = \ test_cx_mag.c @@ -33,7 +33,7 @@ test_cx_mag_SOURCES = \ test_cx_mag_LDADD = \ libcmaths.la \ ../../misc/libmisc.la \ - $(TCL_LIB_SPEC) + $(TCL_LIB_SPEC) test_cx_j_SOURCES = \ test_cx_j.c @@ -41,7 +41,7 @@ test_cx_j_SOURCES = \ test_cx_j_LDADD = \ libcmaths.la \ ../../misc/libmisc.la \ - $(TCL_LIB_SPEC) + $(TCL_LIB_SPEC) TESTS = test_cx_mag test_cx_j test_cx_ph diff --git a/src/maths/deriv/Makefile.am b/src/maths/deriv/Makefile.am index a15636287..c5e60e6fa 100644 --- a/src/maths/deriv/Makefile.am +++ b/src/maths/deriv/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libderiv.la -libderiv_la_SOURCES = \ +libderiv_la_SOURCES = \ atander.c \ cosderiv.c \ cubeder.c \ diff --git a/src/maths/misc/Makefile.am b/src/maths/misc/Makefile.am index 62c8a4143..4f8028ef4 100644 --- a/src/maths/misc/Makefile.am +++ b/src/maths/misc/Makefile.am @@ -3,10 +3,10 @@ noinst_LTLIBRARIES = libmathmisc.la libmathmisc_la_SOURCES = \ - accuracy.c \ - accuracy.h \ + accuracy.c \ + accuracy.h \ bernoull.h \ - bernoull.c \ + bernoull.c \ erfc.c \ equality.c \ isinf.c \ @@ -15,7 +15,7 @@ libmathmisc_la_SOURCES = \ scalb.c \ norm.h \ norm.c \ - randnumb.c + randnumb.c AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 46217ff85..8d037d717 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -25,7 +25,7 @@ libmisc_la_SOURCES = \ tilde.h \ misc_time.c \ misc_time.h \ - wlist.c \ + wlist.c \ util.c \ util.h diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am index f9201b844..9fa8ea42c 100644 --- a/src/spicelib/analysis/Makefile.am +++ b/src/spicelib/analysis/Makefile.am @@ -97,7 +97,7 @@ libckt_la_SOURCES = \ traninit.c \ transetp.c \ cluster.c \ - ckt.h + ckt.h AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index ac4e70e98..91780ff99 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -8,13 +8,13 @@ SUBDIRS = \ bsim2 \ bsim3 \ bsim3soi \ - bsim4 \ - bsim4v2 \ - bsim4v3 \ - bsim4v4 \ - bsim4v5 \ - bsim3v0 \ - bsim3v1 \ + bsim4 \ + bsim4v2 \ + bsim4v3 \ + bsim4v4 \ + bsim4v5 \ + bsim3v0 \ + bsim3v1 \ bsim3v1a \ bsim3v1s \ bsim3v32 \ @@ -41,8 +41,8 @@ SUBDIRS = \ mos2 \ mos3 \ mos6 \ - mos9 \ - @NDEV_DIR@ \ + mos9 \ + @NDEV_DIR@ \ res \ soi3 \ sw \ @@ -65,13 +65,13 @@ DIST_SUBDIRS = \ bsim2 \ bsim3 \ bsim3soi \ - bsim4 \ - bsim4v2 \ - bsim4v3 \ - bsim4v4 \ - bsim4v5 \ - bsim3v0 \ - bsim3v1 \ + bsim4 \ + bsim4v2 \ + bsim4v3 \ + bsim4v4 \ + bsim4v5 \ + bsim3v0 \ + bsim3v1 \ bsim3v1a \ bsim3v1s \ bsim3v32 \ @@ -98,8 +98,8 @@ DIST_SUBDIRS = \ mos2 \ mos3 \ mos6 \ - mos9 \ - @NDEV_DIR@ \ + mos9 \ + @NDEV_DIR@ \ res \ soi3 \ sw \ @@ -119,7 +119,7 @@ DIST_SUBDIRS = \ noinst_LTLIBRARIES = libdev.la -libdev_la_SOURCES = \ +libdev_la_SOURCES = \ dev.c \ dev.h \ devsup.c \ diff --git a/src/spicelib/devices/asrc/Makefile.am b/src/spicelib/devices/asrc/Makefile.am index 70a8d597d..e84f10a18 100644 --- a/src/spicelib/devices/asrc/Makefile.am +++ b/src/spicelib/devices/asrc/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libasrc.la -libasrc_la_SOURCES = \ +libasrc_la_SOURCES = \ asrc.c \ asrcacld.c \ asrcask.c \ diff --git a/src/spicelib/devices/bjt/Makefile.am b/src/spicelib/devices/bjt/Makefile.am index c3cf7c7d8..b0c08d0fd 100644 --- a/src/spicelib/devices/bjt/Makefile.am +++ b/src/spicelib/devices/bjt/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbjt.la -libbjt_la_SOURCES = \ +libbjt_la_SOURCES = \ bjt.c \ bjtacld.c \ bjtask.c \ diff --git a/src/spicelib/devices/bjt2/Makefile.am b/src/spicelib/devices/bjt2/Makefile.am index f8e5ae22a..edd60b85b 100644 --- a/src/spicelib/devices/bjt2/Makefile.am +++ b/src/spicelib/devices/bjt2/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libbjt2.la -libbjt2_la_SOURCES = \ +libbjt2_la_SOURCES = \ bjt2.c \ bjt2acld.c \ bjt2ask.c \ @@ -29,12 +29,12 @@ libbjt2_la_SOURCES = \ bjt2noise.c \ bjt2param.c \ bjt2pzld.c \ - bjt2sacl.c \ + bjt2sacl.c \ bjt2setup.c \ - bjt2sload.c \ - bjt2sprt.c \ - bjt2sset.c \ - bjt2supd.c \ + bjt2sload.c \ + bjt2sprt.c \ + bjt2sset.c \ + bjt2supd.c \ bjt2temp.c \ bjt2trun.c diff --git a/src/spicelib/devices/bsim1/Makefile.am b/src/spicelib/devices/bsim1/Makefile.am index 9159b4256..ad0abc4f4 100644 --- a/src/spicelib/devices/bsim1/Makefile.am +++ b/src/spicelib/devices/bsim1/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim1.la -libbsim1_la_SOURCES = \ +libbsim1_la_SOURCES = \ b1.c \ b1acld.c \ b1ask.c \ diff --git a/src/spicelib/devices/bsim2/Makefile.am b/src/spicelib/devices/bsim2/Makefile.am index f7acca3b4..27f769b8f 100644 --- a/src/spicelib/devices/bsim2/Makefile.am +++ b/src/spicelib/devices/bsim2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim2.la -libbsim2_la_SOURCES = \ +libbsim2_la_SOURCES = \ b2.c \ b2acld.c \ b2ask.c \ diff --git a/src/spicelib/devices/bsim3/Makefile.am b/src/spicelib/devices/bsim3/Makefile.am index 0ca396067..3ba2e474a 100644 --- a/src/spicelib/devices/bsim3/Makefile.am +++ b/src/spicelib/devices/bsim3/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim3.la -libbsim3_la_SOURCES = \ +libbsim3_la_SOURCES = \ b3.c \ b3acld.c \ b3ask.c \ diff --git a/src/spicelib/devices/bsim3soi/Makefile.am b/src/spicelib/devices/bsim3soi/Makefile.am index 9bd697468..56897906c 100644 --- a/src/spicelib/devices/bsim3soi/Makefile.am +++ b/src/spicelib/devices/bsim3soi/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libbsim4soi.la -libbsim4soi_la_SOURCES = \ - b4soi.c \ +libbsim4soi_la_SOURCES = \ + b4soi.c \ b4soiacld.c \ b4soiask.c \ b4soicheck.c \ diff --git a/src/spicelib/devices/bsim3soi_dd/Makefile.am b/src/spicelib/devices/bsim3soi_dd/Makefile.am index 198f0c9f4..857c6b511 100644 --- a/src/spicelib/devices/bsim3soi_dd/Makefile.am +++ b/src/spicelib/devices/bsim3soi_dd/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim3soidd.la -libbsim3soidd_la_SOURCES = \ +libbsim3soidd_la_SOURCES = \ b3soidd.c \ b3soiddacld.c \ b3soiddask.c \ diff --git a/src/spicelib/devices/bsim3soi_fd/Makefile.am b/src/spicelib/devices/bsim3soi_fd/Makefile.am index 91d862603..e30a9e726 100644 --- a/src/spicelib/devices/bsim3soi_fd/Makefile.am +++ b/src/spicelib/devices/bsim3soi_fd/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim3soifd.la -libbsim3soifd_la_SOURCES = \ +libbsim3soifd_la_SOURCES = \ b3soifd.c \ b3soifdacld.c \ b3soifdask.c \ diff --git a/src/spicelib/devices/bsim3soi_pd/Makefile.am b/src/spicelib/devices/bsim3soi_pd/Makefile.am index 986bbb3ec..32954ee0b 100644 --- a/src/spicelib/devices/bsim3soi_pd/Makefile.am +++ b/src/spicelib/devices/bsim3soi_pd/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim3soipd.la -libbsim3soipd_la_SOURCES = \ +libbsim3soipd_la_SOURCES = \ b3soipd.c \ b3soipdacld.c \ b3soipdask.c \ diff --git a/src/spicelib/devices/bsim3v32/Makefile.am b/src/spicelib/devices/bsim3v32/Makefile.am index afe454763..735c3835c 100644 --- a/src/spicelib/devices/bsim3v32/Makefile.am +++ b/src/spicelib/devices/bsim3v32/Makefile.am @@ -2,23 +2,23 @@ noinst_LTLIBRARIES = libbsim3v32.la -libbsim3v32_la_SOURCES = \ +libbsim3v32_la_SOURCES = \ b3v32.c \ b3v32acld.c \ - b3v32ask.c \ + b3v32ask.c \ b3v32check.c \ b3v32cvtest.c \ - b3v32del.c \ + b3v32del.c \ b3v32dest.c \ b3v32getic.c \ - b3v32ld.c \ + b3v32ld.c \ b3v32mask.c \ b3v32mdel.c \ b3v32mpar.c \ - b3v32noi.c \ - b3v32par.c \ + b3v32noi.c \ + b3v32par.c \ b3v32pzld.c \ - b3v32set.c \ + b3v32set.c \ b3v32temp.c \ b3v32trunc.c \ bsim3v32def.h \ diff --git a/src/spicelib/devices/bsim4/Makefile.am b/src/spicelib/devices/bsim4/Makefile.am index 4255fbc8c..d0c79fe0c 100644 --- a/src/spicelib/devices/bsim4/Makefile.am +++ b/src/spicelib/devices/bsim4/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libbsim4.la -libbsim4_la_SOURCES = \ +libbsim4_la_SOURCES = \ b4.c \ b4acld.c \ b4ask.c \ diff --git a/src/spicelib/devices/bsim4v2/Makefile.am b/src/spicelib/devices/bsim4v2/Makefile.am index 17a01ba85..b9f9fde7c 100644 --- a/src/spicelib/devices/bsim4v2/Makefile.am +++ b/src/spicelib/devices/bsim4v2/Makefile.am @@ -2,24 +2,24 @@ noinst_LTLIBRARIES = libbsim4v2.la -libbsim4v2_la_SOURCES = \ +libbsim4v2_la_SOURCES = \ b4v2.c \ b4v2acld.c \ - b4v2ask.c \ + b4v2ask.c \ b4v2check.c \ b4v2cvtest.c \ - b4v2del.c \ + b4v2del.c \ b4v2dest.c \ - b4v2geo.c \ + b4v2geo.c \ b4v2getic.c \ - b4v2ld.c \ + b4v2ld.c \ b4v2mask.c \ b4v2mdel.c \ b4v2mpar.c \ - b4v2noi.c \ - b4v2par.c \ + b4v2noi.c \ + b4v2par.c \ b4v2pzld.c \ - b4v2set.c \ + b4v2set.c \ b4v2temp.c \ b4v2trunc.c \ bsim4v2def.h \ diff --git a/src/spicelib/devices/bsim4v4/Makefile.am b/src/spicelib/devices/bsim4v4/Makefile.am index 721b9716c..90e7291ac 100644 --- a/src/spicelib/devices/bsim4v4/Makefile.am +++ b/src/spicelib/devices/bsim4v4/Makefile.am @@ -2,24 +2,24 @@ noinst_LTLIBRARIES = libbsim4v4.la -libbsim4v4_la_SOURCES = \ +libbsim4v4_la_SOURCES = \ b4v4.c \ b4v4acld.c \ - b4v4ask.c \ + b4v4ask.c \ b4v4check.c \ b4v4cvtest.c \ - b4v4del.c \ + b4v4del.c \ b4v4dest.c \ - b4v4geo.c \ + b4v4geo.c \ b4v4getic.c \ - b4v4ld.c \ + b4v4ld.c \ b4v4mask.c \ b4v4mdel.c \ b4v4mpar.c \ - b4v4noi.c \ - b4v4par.c \ + b4v4noi.c \ + b4v4par.c \ b4v4pzld.c \ - b4v4set.c \ + b4v4set.c \ b4v4temp.c \ b4v4trunc.c \ bsim4v4def.h \ diff --git a/src/spicelib/devices/bsim4v5/Makefile.am b/src/spicelib/devices/bsim4v5/Makefile.am index 1e64d7681..9cec97e54 100644 --- a/src/spicelib/devices/bsim4v5/Makefile.am +++ b/src/spicelib/devices/bsim4v5/Makefile.am @@ -2,24 +2,24 @@ noinst_LTLIBRARIES = libbsim4v5.la -libbsim4v5_la_SOURCES = \ +libbsim4v5_la_SOURCES = \ b4v5.c \ b4v5acld.c \ - b4v5ask.c \ + b4v5ask.c \ b4v5check.c \ b4v5cvtest.c \ - b4v5del.c \ + b4v5del.c \ b4v5dest.c \ - b4v5geo.c \ + b4v5geo.c \ b4v5getic.c \ - b4v5ld.c \ + b4v5ld.c \ b4v5mask.c \ b4v5mdel.c \ b4v5mpar.c \ - b4v5noi.c \ - b4v5par.c \ + b4v5noi.c \ + b4v5par.c \ b4v5pzld.c \ - b4v5set.c \ + b4v5set.c \ b4v5temp.c \ b4v5trunc.c \ bsim4v5def.h \ diff --git a/src/spicelib/devices/cap/Makefile.am b/src/spicelib/devices/cap/Makefile.am index bd337a8db..cb2adebb3 100644 --- a/src/spicelib/devices/cap/Makefile.am +++ b/src/spicelib/devices/cap/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcap.la -libcap_la_SOURCES = \ +libcap_la_SOURCES = \ cap.c \ capacld.c \ capask.c \ diff --git a/src/spicelib/devices/cccs/Makefile.am b/src/spicelib/devices/cccs/Makefile.am index 1209fd71b..dbd23e391 100644 --- a/src/spicelib/devices/cccs/Makefile.am +++ b/src/spicelib/devices/cccs/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcccs.la -libcccs_la_SOURCES = \ +libcccs_la_SOURCES = \ cccs.c \ cccsask.c \ cccsdefs.h \ diff --git a/src/spicelib/devices/ccvs/Makefile.am b/src/spicelib/devices/ccvs/Makefile.am index 217db9efc..3c7697908 100644 --- a/src/spicelib/devices/ccvs/Makefile.am +++ b/src/spicelib/devices/ccvs/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libccvs.la -libccvs_la_SOURCES = \ +libccvs_la_SOURCES = \ ccvs.c \ ccvsask.c \ ccvsdefs.h \ diff --git a/src/spicelib/devices/cpl/Makefile.am b/src/spicelib/devices/cpl/Makefile.am index c67e10922..474664e1a 100755 --- a/src/spicelib/devices/cpl/Makefile.am +++ b/src/spicelib/devices/cpl/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libcpl.la -libcpl_la_SOURCES = \ - cpl.c \ +libcpl_la_SOURCES = \ + cpl.c \ cplask.c \ cpldefs.h \ cpldest.c \ @@ -18,7 +18,7 @@ libcpl_la_SOURCES = \ cplmpar.c \ cplsetup.c \ cplinit.c - + AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/devices/csw/Makefile.am b/src/spicelib/devices/csw/Makefile.am index 5fd6d03cb..3da47f639 100644 --- a/src/spicelib/devices/csw/Makefile.am +++ b/src/spicelib/devices/csw/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libcsw.la -libcsw_la_SOURCES = \ +libcsw_la_SOURCES = \ csw.c \ cswacld.c \ cswask.c \ @@ -20,8 +20,8 @@ libcsw_la_SOURCES = \ cswnoise.c \ cswparam.c \ cswpzld.c \ - cswsetup.c \ - cswtrunc.c + cswsetup.c \ + cswtrunc.c diff --git a/src/spicelib/devices/dio/Makefile.am b/src/spicelib/devices/dio/Makefile.am index 4e5387f47..ab7747619 100644 --- a/src/spicelib/devices/dio/Makefile.am +++ b/src/spicelib/devices/dio/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libdio.la -libdio_la_SOURCES = \ +libdio_la_SOURCES = \ dio.c \ dioacld.c \ dioask.c \ diff --git a/src/spicelib/devices/hfet1/Makefile.am b/src/spicelib/devices/hfet1/Makefile.am index 47e7f8fa1..133b4cdfc 100644 --- a/src/spicelib/devices/hfet1/Makefile.am +++ b/src/spicelib/devices/hfet1/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libhfet.la -libhfet_la_SOURCES = \ +libhfet_la_SOURCES = \ hfet.c \ hfetacl.c \ hfetask.c \ diff --git a/src/spicelib/devices/hfet2/Makefile.am b/src/spicelib/devices/hfet2/Makefile.am index 6e1a0687c..3d7b466b4 100644 --- a/src/spicelib/devices/hfet2/Makefile.am +++ b/src/spicelib/devices/hfet2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libhfet2.la -libhfet2_la_SOURCES = \ +libhfet2_la_SOURCES = \ hfet2.c \ hfet2acl.c \ hfet2ask.c \ diff --git a/src/spicelib/devices/hisim/Makefile.am b/src/spicelib/devices/hisim/Makefile.am index bc6ef9192..2bd1bfdb7 100644 --- a/src/spicelib/devices/hisim/Makefile.am +++ b/src/spicelib/devices/hisim/Makefile.am @@ -4,32 +4,32 @@ EXTRA_DIST = hsm1eval1_0.c hsm1eval1_1.c noinst_LTLIBRARIES = libhisim.la -libhisim_la_SOURCES = hisim.h \ +libhisim_la_SOURCES = hisim.h \ hsm1.c \ hsm1acld.c \ - hsm1ask.c \ - hsm1cvtest.c \ + hsm1ask.c \ + hsm1cvtest.c \ hsm1def.h \ - hsm1del.c \ - hsm1dest.c \ + hsm1del.c \ + hsm1dest.c \ hsm1eval102.c \ - hsm1eval112.c \ - hsm1eval120.c \ + hsm1eval112.c \ + hsm1eval120.c \ hsm1evalenv.h \ hsm1ext.h \ - hsm1getic.c \ - hsm1init.c \ + hsm1getic.c \ + hsm1init.c \ hsm1init.h \ hsm1itf.h \ - hsm1ld.c \ - hsm1mask.c \ - hsm1mdel.c \ - hsm1mpar.c \ - hsm1noi.c \ - hsm1par.c \ - hsm1pzld.c \ - hsm1set.c \ - hsm1temp.c \ + hsm1ld.c \ + hsm1mask.c \ + hsm1mdel.c \ + hsm1mpar.c \ + hsm1noi.c \ + hsm1par.c \ + hsm1pzld.c \ + hsm1set.c \ + hsm1temp.c \ hsm1trunc.c diff --git a/src/spicelib/devices/ind/Makefile.am b/src/spicelib/devices/ind/Makefile.am index 200418db9..bc0f4612e 100644 --- a/src/spicelib/devices/ind/Makefile.am +++ b/src/spicelib/devices/ind/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libind.la -libind_la_SOURCES = \ +libind_la_SOURCES = \ ind.c \ indacld.c \ indask.c \ diff --git a/src/spicelib/devices/isrc/Makefile.am b/src/spicelib/devices/isrc/Makefile.am index c583953fe..e740fb67b 100644 --- a/src/spicelib/devices/isrc/Makefile.am +++ b/src/spicelib/devices/isrc/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libisrc.la -libisrc_la_SOURCES = \ +libisrc_la_SOURCES = \ isrc.c \ isrcacct.c \ isrcacld.c \ diff --git a/src/spicelib/devices/jfet/Makefile.am b/src/spicelib/devices/jfet/Makefile.am index 5b4e7a91e..e67a1357b 100644 --- a/src/spicelib/devices/jfet/Makefile.am +++ b/src/spicelib/devices/jfet/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libjfet.la -libjfet_la_SOURCES = \ +libjfet_la_SOURCES = \ jfet.c \ jfetacld.c \ jfetask.c \ diff --git a/src/spicelib/devices/jfet2/Makefile.am b/src/spicelib/devices/jfet2/Makefile.am index 5a16c7160..62fbb6343 100644 --- a/src/spicelib/devices/jfet2/Makefile.am +++ b/src/spicelib/devices/jfet2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libjfet2.la -libjfet2_la_SOURCES = \ +libjfet2_la_SOURCES = \ jfet2.c \ jfet2acld.c \ jfet2ask.c \ diff --git a/src/spicelib/devices/ltra/Makefile.am b/src/spicelib/devices/ltra/Makefile.am index 1c9e7f663..3261ce171 100644 --- a/src/spicelib/devices/ltra/Makefile.am +++ b/src/spicelib/devices/ltra/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libltra.la -libltra_la_SOURCES = \ +libltra_la_SOURCES = \ ltra.c \ ltraacct.c \ ltraacld.c \ diff --git a/src/spicelib/devices/mes/Makefile.am b/src/spicelib/devices/mes/Makefile.am index 4ec8d2bec..a80b298ca 100644 --- a/src/spicelib/devices/mes/Makefile.am +++ b/src/spicelib/devices/mes/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmes.la -libmes_la_SOURCES = \ +libmes_la_SOURCES = \ mes.c \ mesacl.c \ mesask.c \ diff --git a/src/spicelib/devices/mesa/Makefile.am b/src/spicelib/devices/mesa/Makefile.am index f6cc34f10..fa162cc26 100644 --- a/src/spicelib/devices/mesa/Makefile.am +++ b/src/spicelib/devices/mesa/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmesa.la -libmesa_la_SOURCES = \ +libmesa_la_SOURCES = \ mesa.c \ mesaacl.c \ mesaask.c \ diff --git a/src/spicelib/devices/mos1/Makefile.am b/src/spicelib/devices/mos1/Makefile.am index ee2cb8490..89e1f3428 100644 --- a/src/spicelib/devices/mos1/Makefile.am +++ b/src/spicelib/devices/mos1/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmos1.la -libmos1_la_SOURCES = \ +libmos1_la_SOURCES = \ mos1.c \ mos1acld.c \ mos1ask.c \ diff --git a/src/spicelib/devices/mos2/Makefile.am b/src/spicelib/devices/mos2/Makefile.am index 488c4354f..0e4dbacc6 100644 --- a/src/spicelib/devices/mos2/Makefile.am +++ b/src/spicelib/devices/mos2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmos2.la -libmos2_la_SOURCES = \ +libmos2_la_SOURCES = \ mos2.c \ mos2acld.c \ mos2ask.c \ diff --git a/src/spicelib/devices/mos3/Makefile.am b/src/spicelib/devices/mos3/Makefile.am index e98ce9f9d..f3a110c32 100644 --- a/src/spicelib/devices/mos3/Makefile.am +++ b/src/spicelib/devices/mos3/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmos3.la -libmos3_la_SOURCES = \ +libmos3_la_SOURCES = \ mos3.c \ mos3acld.c \ mos3ask.c \ diff --git a/src/spicelib/devices/mos6/Makefile.am b/src/spicelib/devices/mos6/Makefile.am index 62764be9b..73cd7b352 100644 --- a/src/spicelib/devices/mos6/Makefile.am +++ b/src/spicelib/devices/mos6/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmos6.la -libmos6_la_SOURCES = \ +libmos6_la_SOURCES = \ mos6.c \ mos6ask.c \ mos6conv.c \ diff --git a/src/spicelib/devices/mos9/Makefile.am b/src/spicelib/devices/mos9/Makefile.am index 89e9668bf..05b722c39 100644 --- a/src/spicelib/devices/mos9/Makefile.am +++ b/src/spicelib/devices/mos9/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libmos9.la -libmos9_la_SOURCES = \ +libmos9_la_SOURCES = \ mos9.c \ mos9acld.c \ mos9ask.c \ diff --git a/src/spicelib/devices/nbjt/Makefile.am b/src/spicelib/devices/nbjt/Makefile.am index 9f01a180e..c5280e63d 100644 --- a/src/spicelib/devices/nbjt/Makefile.am +++ b/src/spicelib/devices/nbjt/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libnbjt.la -libnbjt_la_SOURCES = \ +libnbjt_la_SOURCES = \ nbjt.c \ nbjtacld.c \ nbjtask.c \ @@ -21,7 +21,7 @@ libnbjt_la_SOURCES = \ nbjtpzld.c \ nbjtset.c \ nbjttemp.c \ - nbjttrun.c + nbjttrun.c diff --git a/src/spicelib/devices/nbjt2/Makefile.am b/src/spicelib/devices/nbjt2/Makefile.am index 3147a3d61..ab8b2c12e 100644 --- a/src/spicelib/devices/nbjt2/Makefile.am +++ b/src/spicelib/devices/nbjt2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libnbjt2.la -libnbjt2_la_SOURCES = \ +libnbjt2_la_SOURCES = \ nbt2.c \ nbt2acld.c \ nbt2ask.c \ @@ -21,7 +21,7 @@ libnbjt2_la_SOURCES = \ nbt2pzld.c \ nbt2set.c \ nbt2temp.c \ - nbt2trun.c + nbt2trun.c diff --git a/src/spicelib/devices/ndev/Makefile.am b/src/spicelib/devices/ndev/Makefile.am index 8162def45..9beaf82cc 100644 --- a/src/spicelib/devices/ndev/Makefile.am +++ b/src/spicelib/devices/ndev/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libndev.la -libndev_la_SOURCES = \ +libndev_la_SOURCES = \ ndev.c \ ndevacld.c \ ndevaccept.c \ @@ -22,7 +22,7 @@ libndev_la_SOURCES = \ ndevpzld.c \ ndevset.c \ ndevtemp.c \ - ndevtrun.c + ndevtrun.c AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/spicelib/devices/numd/Makefile.am b/src/spicelib/devices/numd/Makefile.am index 061b93f43..8f57dd9dd 100644 --- a/src/spicelib/devices/numd/Makefile.am +++ b/src/spicelib/devices/numd/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libnumd.la -libnumd_la_SOURCES = \ +libnumd_la_SOURCES = \ numd.c \ numdacld.c \ numdask.c \ @@ -21,7 +21,7 @@ libnumd_la_SOURCES = \ numdpzld.c \ numdset.c \ numdtemp.c \ - numdtrun.c + numdtrun.c AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/spicelib/devices/numd2/Makefile.am b/src/spicelib/devices/numd2/Makefile.am index f032cbee2..f97c3026d 100644 --- a/src/spicelib/devices/numd2/Makefile.am +++ b/src/spicelib/devices/numd2/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libnumd2.la -libnumd2_la_SOURCES = \ +libnumd2_la_SOURCES = \ nud2.c \ nud2acld.c \ nud2ask.c \ @@ -21,7 +21,7 @@ libnumd2_la_SOURCES = \ nud2pzld.c \ nud2set.c \ nud2temp.c \ - nud2trun.c + nud2trun.c diff --git a/src/spicelib/devices/numos/Makefile.am b/src/spicelib/devices/numos/Makefile.am index f4434754f..5abf7807e 100644 --- a/src/spicelib/devices/numos/Makefile.am +++ b/src/spicelib/devices/numos/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libnumos.la -libnumos_la_SOURCES = \ +libnumos_la_SOURCES = \ numm.c \ nummacld.c \ nummask.c \ @@ -21,7 +21,7 @@ libnumos_la_SOURCES = \ nummpzld.c \ nummset.c \ nummtemp.c \ - nummtrun.c + nummtrun.c diff --git a/src/spicelib/devices/res/Makefile.am b/src/spicelib/devices/res/Makefile.am index 5cc2acef2..c0bb582d4 100644 --- a/src/spicelib/devices/res/Makefile.am +++ b/src/spicelib/devices/res/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libres.la -libres_la_SOURCES = \ +libres_la_SOURCES = \ res.c \ resask.c \ resdefs.h \ diff --git a/src/spicelib/devices/soi3/Makefile.am b/src/spicelib/devices/soi3/Makefile.am index d06842e1f..42f33546d 100644 --- a/src/spicelib/devices/soi3/Makefile.am +++ b/src/spicelib/devices/soi3/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libsoi3.la -libsoi3_la_SOURCES = \ +libsoi3_la_SOURCES = \ soi3.c \ soi3acld.c \ soi3ask.c \ diff --git a/src/spicelib/devices/sw/Makefile.am b/src/spicelib/devices/sw/Makefile.am index ad2ee5429..fee60c259 100644 --- a/src/spicelib/devices/sw/Makefile.am +++ b/src/spicelib/devices/sw/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libsw.la -libsw_la_SOURCES = \ +libsw_la_SOURCES = \ sw.c \ swacload.c \ swask.c \ @@ -21,7 +21,7 @@ libsw_la_SOURCES = \ swparam.c \ swpzload.c \ swsetup.c \ - swtrunc.c + swtrunc.c diff --git a/src/spicelib/devices/tra/Makefile.am b/src/spicelib/devices/tra/Makefile.am index 5fdcd4ae2..39d3db748 100644 --- a/src/spicelib/devices/tra/Makefile.am +++ b/src/spicelib/devices/tra/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libtra.la -libtra_la_SOURCES = \ +libtra_la_SOURCES = \ tra.c \ traacct.c \ traacld.c \ diff --git a/src/spicelib/devices/txl/Makefile.am b/src/spicelib/devices/txl/Makefile.am index 16d39252e..84bae1b96 100755 --- a/src/spicelib/devices/txl/Makefile.am +++ b/src/spicelib/devices/txl/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libtxl.la -libtxl_la_SOURCES = \ +libtxl_la_SOURCES = \ txl.c \ txlacct.c \ txlask.c \ @@ -20,7 +20,7 @@ libtxl_la_SOURCES = \ txlmpar.c \ txlsetup.c \ txlinit.c - + AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/devices/urc/Makefile.am b/src/spicelib/devices/urc/Makefile.am index a2daf700b..a248dc20f 100644 --- a/src/spicelib/devices/urc/Makefile.am +++ b/src/spicelib/devices/urc/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = liburc.la -liburc_la_SOURCES = \ +liburc_la_SOURCES = \ urc.c \ urcask.c \ urcdefs.h \ diff --git a/src/spicelib/devices/vbic/Makefile.am b/src/spicelib/devices/vbic/Makefile.am index 7cc21e239..8bf680556 100644 --- a/src/spicelib/devices/vbic/Makefile.am +++ b/src/spicelib/devices/vbic/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libvbic.la -libvbic_la_SOURCES = \ +libvbic_la_SOURCES = \ vbic.c \ vbicacld.c \ vbicask.c \ diff --git a/src/spicelib/devices/vccs/Makefile.am b/src/spicelib/devices/vccs/Makefile.am index d7a2b2a6e..fdc1cd042 100644 --- a/src/spicelib/devices/vccs/Makefile.am +++ b/src/spicelib/devices/vccs/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libvccs.la -libvccs_la_SOURCES = \ +libvccs_la_SOURCES = \ vccs.c \ vccsask.c \ vccsdefs.h \ diff --git a/src/spicelib/devices/vcvs/Makefile.am b/src/spicelib/devices/vcvs/Makefile.am index 158876adf..edb394180 100644 --- a/src/spicelib/devices/vcvs/Makefile.am +++ b/src/spicelib/devices/vcvs/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libvcvs.la -libvcvs_la_SOURCES = \ +libvcvs_la_SOURCES = \ vcvs.c \ vcvsask.c \ vcvsdefs.h \ diff --git a/src/spicelib/devices/vsrc/Makefile.am b/src/spicelib/devices/vsrc/Makefile.am index b5e35b9df..aceb12d71 100644 --- a/src/spicelib/devices/vsrc/Makefile.am +++ b/src/spicelib/devices/vsrc/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libvsrc.la -libvsrc_la_SOURCES = \ +libvsrc_la_SOURCES = \ vsrc.c \ vsrcacct.c \ vsrcacld.c \ diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am index 858989c4a..6bb19acd5 100644 --- a/src/spicelib/parser/Makefile.am +++ b/src/spicelib/parser/Makefile.am @@ -22,7 +22,7 @@ libinp_la_SOURCES = \ inp2k.c \ inp2l.c \ inp2m.c \ - inp2n.c \ + inp2n.c \ inp2o.c \ inp2p.c \ inp2q.c \ @@ -38,7 +38,7 @@ libinp_la_SOURCES = \ inpapnam.c \ inpcfix.c \ inpdomod.c \ - inpdoopt.c \ + inpdoopt.c \ inpdpar.c \ inperrc.c \ inperror.c \ @@ -59,8 +59,8 @@ libinp_la_SOURCES = \ inppas1.h \ inppas2.c \ inppas2.h \ - inppas3.c \ - inppas3.h \ + inppas3.c \ + inppas3.h \ inppname.c \ inpptree.c \ inpsymt.c \ diff --git a/src/xspice/cm/Makefile.am b/src/xspice/cm/Makefile.am index 6898e4947..1fcfa49b9 100755 --- a/src/xspice/cm/Makefile.am +++ b/src/xspice/cm/Makefile.am @@ -5,11 +5,11 @@ noinst_LTLIBRARIES = libcmxsp.la libcmxsp_la_SOURCES = \ -cm.c \ -cmevt.c \ -cmmeters.c \ -cmutil.c \ -cmexport.c + cm.c \ + cmevt.c \ + cmmeters.c \ + cmutil.c \ + cmexport.c diff --git a/src/xspice/enh/Makefile.am b/src/xspice/enh/Makefile.am index d7246c32f..b6984f746 100755 --- a/src/xspice/enh/Makefile.am +++ b/src/xspice/enh/Makefile.am @@ -5,8 +5,8 @@ noinst_LTLIBRARIES = libenhxsp.la libenhxsp_la_SOURCES = \ -enh.c \ -enhtrans.c + enh.c \ + enhtrans.c AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/xspice/evt/Makefile.am b/src/xspice/evt/Makefile.am index 0a89681cb..763e4eb65 100755 --- a/src/xspice/evt/Makefile.am +++ b/src/xspice/evt/Makefile.am @@ -5,22 +5,22 @@ noinst_LTLIBRARIES = libevtxsp.la libevtxsp_la_SOURCES = \ -evtaccept.c \ -evtcall_hybrids.c \ -evtdump.c \ -evtiter.c \ -evtnext_time.c \ -evtop.c \ -evtprint.c \ -evtsetup.c \ -evtbackup.c \ -evtdeque.c \ -evtinit.c \ -evtload.c \ -evtnode_copy.c \ -evtplot.c \ -evtqueue.c \ -evttermi.c + evtaccept.c \ + evtcall_hybrids.c \ + evtdump.c \ + evtiter.c \ + evtnext_time.c \ + evtop.c \ + evtprint.c \ + evtsetup.c \ + evtbackup.c \ + evtdeque.c \ + evtinit.c \ + evtload.c \ + evtnode_copy.c \ + evtplot.c \ + evtqueue.c \ + evttermi.c AM_CPPFLAGS = -I$(top_srcdir)/src/include diff --git a/src/xspice/ipc/Makefile.am b/src/xspice/ipc/Makefile.am index 995690913..7ffbb255e 100755 --- a/src/xspice/ipc/Makefile.am +++ b/src/xspice/ipc/Makefile.am @@ -5,11 +5,11 @@ noinst_LTLIBRARIES = libipcxsp.la libipcxsp_la_SOURCES = \ -ipcaegis.c \ -ipc.c \ -ipcsockets.c \ -ipcstdio.c \ -ipctiein.c + ipcaegis.c \ + ipc.c \ + ipcsockets.c \ + ipcstdio.c \ + ipctiein.c AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices diff --git a/tests/Makefile.am b/tests/Makefile.am index 62da87db3..431ef958d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,12 +22,12 @@ SUBDIRS = bsim1 \ transient \ transmission \ vbic - -DIST_SUBDIRS = bsim1 \ + +DIST_SUBDIRS = bsim1 \ bsim2 \ bsim3 \ - bsim3soi \ + bsim3soi \ bsim3soidd \ bsim3soifd \ bsim3soipd \ @@ -51,6 +51,6 @@ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/sr EXTRA_DIST = \ README bin - + MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/bsim1/Makefile.am b/tests/bsim1/Makefile.am index ba4654a3e..9924d8c7c 100644 --- a/tests/bsim1/Makefile.am +++ b/tests/bsim1/Makefile.am @@ -6,7 +6,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/bsim2/Makefile.am b/tests/bsim2/Makefile.am index ba4654a3e..9924d8c7c 100644 --- a/tests/bsim2/Makefile.am +++ b/tests/bsim2/Makefile.am @@ -6,7 +6,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/bsim3/ac_sim/Makefile.am b/tests/bsim3/ac_sim/Makefile.am index 5931ec7e8..e3cfa712c 100644 --- a/tests/bsim3/ac_sim/Makefile.am +++ b/tests/bsim3/ac_sim/Makefile.am @@ -1,13 +1,13 @@ ## Process this file with automake to produce Makefile.in -TESTS = gain-stage.cir \ +TESTS = gain-stage.cir \ op-amp.cir - + TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/bsim3/dc_sim/Makefile.am b/tests/bsim3/dc_sim/Makefile.am index 9238c5a0a..b82610ee5 100644 --- a/tests/bsim3/dc_sim/Makefile.am +++ b/tests/bsim3/dc_sim/Makefile.am @@ -15,7 +15,7 @@ TESTS = \ test12.cir \ test13.cir \ test14.cir - + TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice diff --git a/tests/bsim3/tran_sim/Makefile.am b/tests/bsim3/tran_sim/Makefile.am index f22519992..54e433c44 100644 --- a/tests/bsim3/tran_sim/Makefile.am +++ b/tests/bsim3/tran_sim/Makefile.am @@ -7,7 +7,7 @@ TESTS = comparator.cir \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/bsim3soidd/Makefile.am b/tests/bsim3soidd/Makefile.am index f81384813..b99b7ce79 100644 --- a/tests/bsim3soidd/Makefile.am +++ b/tests/bsim3soidd/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to produce Makefile.in TESTS = \ - t3.cir \ - t4.cir \ - t5.cir \ + t3.cir \ + t4.cir \ + t5.cir \ inv2.cir \ RampVg2.cir diff --git a/tests/bsim3soifd/Makefile.am b/tests/bsim3soifd/Makefile.am index df6535e17..6a6594b62 100644 --- a/tests/bsim3soifd/Makefile.am +++ b/tests/bsim3soifd/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to produce Makefile.in TESTS = \ - t3.cir \ - t4.cir \ - t5.cir \ + t3.cir \ + t4.cir \ + t5.cir \ inv2.cir \ RampVg2.cir diff --git a/tests/bsim3soipd/Makefile.am b/tests/bsim3soipd/Makefile.am index 1f1de6017..966c500b8 100644 --- a/tests/bsim3soipd/Makefile.am +++ b/tests/bsim3soipd/Makefile.am @@ -1,9 +1,9 @@ ## Process this file with automake to produce Makefile.in TESTS = \ - t3.cir \ - t4.cir \ - t5.cir \ + t3.cir \ + t4.cir \ + t5.cir \ inv2.cir \ RampVg2.cir diff --git a/tests/filters/Makefile.am b/tests/filters/Makefile.am index e2e5f03eb..8f273be2f 100644 --- a/tests/filters/Makefile.am +++ b/tests/filters/Makefile.am @@ -6,7 +6,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am index c05de52d9..a6c1775d4 100644 --- a/tests/general/Makefile.am +++ b/tests/general/Makefile.am @@ -8,13 +8,13 @@ TESTS = \ rca3040.cir \ rtlinv.cir \ schmitt.cir \ - diffpair.cir \ + diffpair.cir \ fourbitadder.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/hfet/Makefile.am b/tests/hfet/Makefile.am index a00956490..369131307 100644 --- a/tests/hfet/Makefile.am +++ b/tests/hfet/Makefile.am @@ -8,7 +8,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/hisim/Makefile.am b/tests/hisim/Makefile.am index 4711f9380..7ef91322c 100644 --- a/tests/hisim/Makefile.am +++ b/tests/hisim/Makefile.am @@ -6,7 +6,7 @@ TESTS = test1.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/jfet/Makefile.am b/tests/jfet/Makefile.am index 9e79133dc..77425073d 100644 --- a/tests/jfet/Makefile.am +++ b/tests/jfet/Makefile.am @@ -6,7 +6,7 @@ TESTS = jfet_vds-vgs.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/mes/Makefile.am b/tests/mes/Makefile.am index 515018032..51dc7c39b 100644 --- a/tests/mes/Makefile.am +++ b/tests/mes/Makefile.am @@ -6,7 +6,7 @@ TESTS = subth.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/mesa/Makefile.am b/tests/mesa/Makefile.am index 0e757ffaa..bf2be67e6 100644 --- a/tests/mesa/Makefile.am +++ b/tests/mesa/Makefile.am @@ -9,12 +9,12 @@ TESTS = \ mesa.cir \ mesgout.cir \ mesinv.cir \ - mesosc.cir + mesosc.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/mos6/Makefile.am b/tests/mos6/Makefile.am index ab0b4e8ae..96db4d0e0 100644 --- a/tests/mos6/Makefile.am +++ b/tests/mos6/Makefile.am @@ -8,7 +8,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/polezero/Makefile.am b/tests/polezero/Makefile.am index 8c1b16007..d48c50f36 100644 --- a/tests/polezero/Makefile.am +++ b/tests/polezero/Makefile.am @@ -11,7 +11,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/resistance/Makefile.am b/tests/resistance/Makefile.am index 699e4071b..ff1e7970f 100644 --- a/tests/resistance/Makefile.am +++ b/tests/resistance/Makefile.am @@ -8,7 +8,7 @@ TESTS = \ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/sensitivity/Makefile.am b/tests/sensitivity/Makefile.am index 5633d5428..437ad6990 100644 --- a/tests/sensitivity/Makefile.am +++ b/tests/sensitivity/Makefile.am @@ -6,7 +6,7 @@ TESTS = diffpair.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/transient/Makefile.am b/tests/transient/Makefile.am index fe8680b3c..9b2ccced2 100644 --- a/tests/transient/Makefile.am +++ b/tests/transient/Makefile.am @@ -6,7 +6,7 @@ TESTS = fourbitadder.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/transmission/Makefile.am b/tests/transmission/Makefile.am index 845cd6e62..0d79bbd0e 100644 --- a/tests/transmission/Makefile.am +++ b/tests/transmission/Makefile.am @@ -1,18 +1,18 @@ ## Process this file with automake to produce Makefile.in TESTS = \ - cpl_ibm2.cir \ - cpl3_4_line.cir \ + cpl_ibm2.cir \ + cpl3_4_line.cir \ ltra1_1_line.cir \ ltra2_2_line.cir \ - txl1_1_line.cir \ + txl1_1_line.cir \ txl2_3_line.cir - - + + TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/vbic/Makefile.am b/tests/vbic/Makefile.am index 91966bc7b..e9186f87f 100644 --- a/tests/vbic/Makefile.am +++ b/tests/vbic/Makefile.am @@ -3,16 +3,16 @@ TESTS = CEamp.cir \ - FG.cir \ - FO.cir \ - diffamp.cir \ - noise_scale_test.cir \ + FG.cir \ + FO.cir \ + diffamp.cir \ + noise_scale_test.cir \ temp.cir TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice EXTRA_DIST = \ - $(TESTS) \ + $(TESTS) \ $(TESTS:.cir=.out) diff --git a/xgraph/Makefile.am b/xgraph/Makefile.am index 931f59d51..c52a85bd5 100644 --- a/xgraph/Makefile.am +++ b/xgraph/Makefile.am @@ -23,7 +23,7 @@ xgraph_SOURCES = $(xgraph_c_sources) man_MANS = xgraph.man -EXTRA_DIST=\ +EXTRA_DIST = \ $(man_MANS) \ README.ANNOUNCE \ README.GENERAL \ @@ -49,8 +49,8 @@ EXTRA_DIST=\ # C_WARNINGS = -Wall -C_WARNINGS = -CFLAGS=$(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS) +C_WARNINGS = +CFLAGS=$(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS) xgraph_LDADD= $(ADDITIONAL_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lm