From 7f6ad5c706b57d2dac6ac9d3cac835d71b0144a5 Mon Sep 17 00:00:00 2001 From: pnenzi Date: Sun, 24 Aug 2008 17:12:50 +0000 Subject: [PATCH] Updated to new automake standard. Replaced all INCLUDES with AM_CPPFLAGS --- src/Makefile.am | 2 +- src/ciderlib/input/Makefile.am | 2 +- src/ciderlib/oned/Makefile.am | 2 +- src/ciderlib/support/Makefile.am | 2 +- src/ciderlib/twod/Makefile.am | 2 +- src/frontend/Makefile.am | 2 +- src/frontend/help/Makefile.am | 2 +- src/frontend/numparam/Makefile.am | 2 +- src/frontend/parser/Makefile.am | 2 +- src/frontend/plotting/Makefile.am | 2 +- src/frontend/wdisp/Makefile.am | 2 +- src/maths/cmaths/Makefile.am | 2 +- src/maths/deriv/Makefile.am | 2 +- src/maths/misc/Makefile.am | 2 +- src/maths/ni/Makefile.am | 2 +- src/maths/poly/Makefile.am | 2 +- src/maths/sparse/Makefile.am | 2 +- src/misc/Makefile.am | 2 +- src/spicelib/analysis/Makefile.am | 2 +- src/spicelib/devices/Makefile.am | 2 +- src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml | 8 ++++++-- src/spicelib/devices/asrc/Makefile.am | 2 +- src/spicelib/devices/bjt/Makefile.am | 2 +- src/spicelib/devices/bjt2/Makefile.am | 2 +- 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 | 2 +- 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/bsim3v0/Makefile.am | 2 +- src/spicelib/devices/bsim3v1/Makefile.am | 2 +- src/spicelib/devices/bsim3v1a/Makefile.am | 2 +- src/spicelib/devices/bsim3v1s/Makefile.am | 2 +- src/spicelib/devices/bsim3v32/Makefile.am | 2 +- src/spicelib/devices/bsim4/Makefile.am | 2 +- src/spicelib/devices/bsim4v2/Makefile.am | 2 +- src/spicelib/devices/bsim4v3/Makefile.am | 2 +- src/spicelib/devices/bsim4v4/Makefile.am | 2 +- src/spicelib/devices/bsim4v5/Makefile.am | 2 +- 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 | 2 +- src/spicelib/devices/csw/Makefile.am | 2 +- 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 | 2 +- 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 | 2 +- src/spicelib/devices/nbjt2/Makefile.am | 2 +- src/spicelib/devices/ndev/Makefile.am | 2 +- src/spicelib/devices/numd/Makefile.am | 2 +- src/spicelib/devices/numd2/Makefile.am | 2 +- src/spicelib/devices/numos/Makefile.am | 2 +- src/spicelib/devices/res/Makefile.am | 2 +- src/spicelib/devices/soi3/Makefile.am | 2 +- src/spicelib/devices/sw/Makefile.am | 2 +- src/spicelib/devices/tra/Makefile.am | 2 +- src/spicelib/devices/txl/Makefile.am | 2 +- 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 | 2 +- src/xspice/cm/Makefile.am | 2 +- src/xspice/enh/Makefile.am | 2 +- src/xspice/evt/Makefile.am | 2 +- src/xspice/icm/Makefile.am | 2 +- src/xspice/idn/Makefile.am | 2 +- src/xspice/ipc/Makefile.am | 2 +- src/xspice/mif/Makefile.am | 2 +- 86 files changed, 91 insertions(+), 87 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cdc02d489..b75401b52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -222,7 +222,7 @@ ngspice.idx: ngmakeidx ## General Includes and libraries: -INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ diff --git a/src/ciderlib/input/Makefile.am b/src/ciderlib/input/Makefile.am index 4afc12296..9e8b1ba90 100644 --- a/src/ciderlib/input/Makefile.am +++ b/src/ciderlib/input/Makefile.am @@ -29,5 +29,5 @@ libciderinput_a_SOURCES = \ EXTRA_DIST = readme -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/ciderlib/oned/Makefile.am b/src/ciderlib/oned/Makefile.am index fc47262e9..4e8ea9cc5 100644 --- a/src/ciderlib/oned/Makefile.am +++ b/src/ciderlib/oned/Makefile.am @@ -21,5 +21,5 @@ libcideroned_a_SOURCES = \ onesolve.c EXTRA_DIST = notes readme -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/ciderlib/support/Makefile.am b/src/ciderlib/support/Makefile.am index 74db0682f..1ce07fd45 100644 --- a/src/ciderlib/support/Makefile.am +++ b/src/ciderlib/support/Makefile.am @@ -17,5 +17,5 @@ libcidersuprt_a_SOURCES = \ suprem.c \ suprmitf.c -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/ciderlib/twod/Makefile.am b/src/ciderlib/twod/Makefile.am index d2b6fa7b8..ff589da7b 100644 --- a/src/ciderlib/twod/Makefile.am +++ b/src/ciderlib/twod/Makefile.am @@ -29,5 +29,5 @@ libcidertwod_a_SOURCES = \ twosolve.c EXTRA_DIST = readme -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 0cb67396c..64b630cd2 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -185,6 +185,6 @@ libfte_a_SOURCES = \ # testcommands_LDADD = libfte.a plotting/libplotting.a ../misc/libmisc.a -INCLUDES = -I$(top_srcdir)/src/include @X_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@ MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/help/Makefile.am b/src/frontend/help/Makefile.am index 5a9f8a7ac..a665b63d4 100644 --- a/src/frontend/help/Makefile.am +++ b/src/frontend/help/Makefile.am @@ -14,7 +14,7 @@ libhlp_a_SOURCES = \ -INCLUDES = -I$(top_srcdir)/src/include @X_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@ endif diff --git a/src/frontend/numparam/Makefile.am b/src/frontend/numparam/Makefile.am index f20a62bb0..f2ced1d85 100644 --- a/src/frontend/numparam/Makefile.am +++ b/src/frontend/numparam/Makefile.am @@ -12,5 +12,5 @@ libnumparam_a_SOURCES = \ numpaif.h \ numparam.h -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/parser/Makefile.am b/src/frontend/parser/Makefile.am index b143119a5..aa4caaaf1 100644 --- a/src/frontend/parser/Makefile.am +++ b/src/frontend/parser/Makefile.am @@ -22,5 +22,5 @@ libparser_a_SOURCES = \ unixcom.h -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am index 8dd2723bb..53e927b53 100644 --- a/src/frontend/plotting/Makefile.am +++ b/src/frontend/plotting/Makefile.am @@ -32,6 +32,6 @@ libplotting_a_SOURCES += \ xgraph.h endif -INCLUDES = -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 3f43f2434..650fbcc48 100644 --- a/src/frontend/wdisp/Makefile.am +++ b/src/frontend/wdisp/Makefile.am @@ -11,6 +11,6 @@ libwindisp_a_SOURCES = \ ftegraf.h -INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am index 6ca74560f..6ab086c3a 100644 --- a/src/maths/cmaths/Makefile.am +++ b/src/maths/cmaths/Makefile.am @@ -44,6 +44,6 @@ TESTS = test_cx_mag test_cx_j test_cx_ph endif !WINDOWS -INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/deriv/Makefile.am b/src/maths/deriv/Makefile.am index 260e76133..914fd0cb5 100644 --- a/src/maths/deriv/Makefile.am +++ b/src/maths/deriv/Makefile.am @@ -19,5 +19,5 @@ libderiv_a_SOURCES = \ -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/misc/Makefile.am b/src/maths/misc/Makefile.am index f5815c594..ff37e8bf6 100644 --- a/src/maths/misc/Makefile.am +++ b/src/maths/misc/Makefile.am @@ -15,6 +15,6 @@ libmathmisc_a_SOURCES = \ norm.h \ norm.c -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/ni/Makefile.am b/src/maths/ni/Makefile.am index f685a50a3..6171f5c91 100644 --- a/src/maths/ni/Makefile.am +++ b/src/maths/ni/Makefile.am @@ -31,6 +31,6 @@ libni_a_SOURCES = \ nisenre.h -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/poly/Makefile.am b/src/maths/poly/Makefile.am index bdff80280..58e0685c4 100644 --- a/src/maths/poly/Makefile.am +++ b/src/maths/poly/Makefile.am @@ -13,6 +13,6 @@ libpoly_a_SOURCES = \ polyeval.h -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am index ddedb9686..eb2670e96 100644 --- a/src/maths/sparse/Makefile.am +++ b/src/maths/sparse/Makefile.am @@ -18,6 +18,6 @@ libsparse_a_SOURCES = \ -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 831d3d0c3..9cf279a9f 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -35,5 +35,5 @@ libmisc_a_SOURCES = \ -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am index d828f2b24..8bdcedfdb 100644 --- a/src/spicelib/analysis/Makefile.am +++ b/src/spicelib/analysis/Makefile.am @@ -100,5 +100,5 @@ libckt_a_SOURCES = \ ckt.h -INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index ef76d2adf..2374bd73d 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -132,6 +132,6 @@ libdev_a_SOURCES = \ cktinit.c \ limit.c -INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices MAINTAINERCLEANFILES = Makefile.in diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml index 9aa2f840f..6e1b8695c 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml @@ -3,7 +3,11 @@