Updated to new automake standard. Replaced all INCLUDES with AM_CPPFLAGS

18 years ago · 7f6ad5c706
86 changed files with 91 additions and 87 deletions
--- 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@

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@ -3,7 +3,11 @@
 <!--
  $Id$
  $Log$
-  Revision 1.12  2008-08-19 08:48:26  r29173
+  Revision 1.13  2008-08-24 17:12:59  pnenzi
+
+  Updated to new automake standard. Replaced all INCLUDES with AM_CPPFLAGS
+
+  Revision 1.12  2008/08/19 08:48:26  r29173
  add dependency $module.c: admsva/$module.va

  Revision 1.11  2007/07/05 09:44:12  r29173
@ -184,7 +188,7 @@ CLEANFILES = 		\\
 	$(module)conv.c	\\
 	$(module)getic.c

-INCLUDES = -I\$(top_srcdir)/src/include
+AM_CPPFLAGS = -I\$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in

--- a/src/spicelib/devices/asrc/Makefile.am
+++ b/src/spicelib/devices/asrc/Makefile.am
@ -22,5 +22,5 @@ libasrc_a_SOURCES = 	\
 	asrcset.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bjt/Makefile.am
+++ b/src/spicelib/devices/bjt/Makefile.am
@ -36,6 +36,6 @@ libbjt_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bjt2/Makefile.am
+++ b/src/spicelib/devices/bjt2/Makefile.am
@ -40,6 +40,6 @@ libbjt2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim1/Makefile.am
+++ b/src/spicelib/devices/bsim1/Makefile.am
@ -32,5 +32,5 @@ libbsim1_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim2/Makefile.am
+++ b/src/spicelib/devices/bsim2/Makefile.am
@ -30,6 +30,6 @@ libbsim2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3/Makefile.am
+++ b/src/spicelib/devices/bsim3/Makefile.am
@ -29,6 +29,6 @@ libbsim3_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3soi/Makefile.am
+++ b/src/spicelib/devices/bsim3soi/Makefile.am
@ -29,6 +29,6 @@ libbsim3soi_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3soi_dd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_dd/Makefile.am
@ -29,6 +29,6 @@ libbsim3soidd_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3soi_fd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_fd/Makefile.am
@ -29,6 +29,6 @@ libbsim3soifd_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3soi_pd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_pd/Makefile.am
@ -29,6 +29,6 @@ libbsim3soipd_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3v0/Makefile.am
+++ b/src/spicelib/devices/bsim3v0/Makefile.am
@ -28,6 +28,6 @@ libbsim3v0_a_SOURCES = \



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3v1/Makefile.am
+++ b/src/spicelib/devices/bsim3v1/Makefile.am
@ -29,6 +29,6 @@ libbsim3v1_a_SOURCES = \



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3v1a/Makefile.am
+++ b/src/spicelib/devices/bsim3v1a/Makefile.am
@ -28,6 +28,6 @@ libbsim3v1a_a_SOURCES = \



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3v1s/Makefile.am
+++ b/src/spicelib/devices/bsim3v1s/Makefile.am
@ -29,6 +29,6 @@ libbsim3v1s_a_SOURCES = \



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim3v32/Makefile.am
+++ b/src/spicelib/devices/bsim3v32/Makefile.am
@ -29,6 +29,6 @@ libbsim3v32_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim4/Makefile.am
+++ b/src/spicelib/devices/bsim4/Makefile.am
@ -30,6 +30,6 @@ libbsim4_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim4v2/Makefile.am
+++ b/src/spicelib/devices/bsim4v2/Makefile.am
@ -30,6 +30,6 @@ libbsim4v2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim4v3/Makefile.am
+++ b/src/spicelib/devices/bsim4v3/Makefile.am
@ -30,6 +30,6 @@ libbsim4v3_a_SOURCES =	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim4v4/Makefile.am
+++ b/src/spicelib/devices/bsim4v4/Makefile.am
@ -30,6 +30,6 @@ libbsim4v4_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/bsim4v5/Makefile.am
+++ b/src/spicelib/devices/bsim4v5/Makefile.am
@ -30,6 +30,6 @@ libbsim4v5_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/cap/Makefile.am
+++ b/src/spicelib/devices/cap/Makefile.am
@ -31,6 +31,6 @@ libcap_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/cccs/Makefile.am
+++ b/src/spicelib/devices/cccs/Makefile.am
@ -24,5 +24,5 @@ libcccs_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/ccvs/Makefile.am
+++ b/src/spicelib/devices/ccvs/Makefile.am
@ -25,6 +25,6 @@ libccvs_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/cpl/Makefile.am
+++ b/src/spicelib/devices/cpl/Makefile.am
@ -19,6 +19,6 @@ libcpl_a_SOURCES = 	\
 	cplsetup.c \
 	cplinit.c
    
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/csw/Makefile.am
+++ b/src/spicelib/devices/csw/Makefile.am
@ -25,5 +25,5 @@ libcsw_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/dio/Makefile.am
+++ b/src/spicelib/devices/dio/Makefile.am
@ -34,5 +34,5 @@ libdio_a_SOURCES = 	\
 	diotrunc.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/hfet1/Makefile.am
+++ b/src/spicelib/devices/hfet1/Makefile.am
@ -26,5 +26,5 @@ libhfet_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/hfet2/Makefile.am
+++ b/src/spicelib/devices/hfet2/Makefile.am
@ -26,5 +26,5 @@ libhfet2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/hisim/Makefile.am
+++ b/src/spicelib/devices/hisim/Makefile.am
@ -33,6 +33,6 @@ libhisim_a_SOURCES = 	hisim.h		\
 			hsm1trunc.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/ind/Makefile.am
+++ b/src/spicelib/devices/ind/Makefile.am
@ -41,5 +41,5 @@ libind_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/isrc/Makefile.am
+++ b/src/spicelib/devices/isrc/Makefile.am
@ -21,5 +21,5 @@ libisrc_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/jfet/Makefile.am
+++ b/src/spicelib/devices/jfet/Makefile.am
@ -29,5 +29,5 @@ libjfet_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/jfet2/Makefile.am
+++ b/src/spicelib/devices/jfet2/Makefile.am
@ -30,5 +30,5 @@ libjfet2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/ltra/Makefile.am
+++ b/src/spicelib/devices/ltra/Makefile.am
@ -26,5 +26,5 @@ libltra_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mes/Makefile.am
+++ b/src/spicelib/devices/mes/Makefile.am
@ -29,5 +29,5 @@ libmes_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mesa/Makefile.am
+++ b/src/spicelib/devices/mesa/Makefile.am
@ -26,5 +26,5 @@ libmesa_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mos1/Makefile.am
+++ b/src/spicelib/devices/mos1/Makefile.am
@ -35,5 +35,5 @@ libmos1_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mos2/Makefile.am
+++ b/src/spicelib/devices/mos2/Makefile.am
@ -34,5 +34,5 @@ libmos2_a_SOURCES = 	\
 	mos2trun.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mos3/Makefile.am
+++ b/src/spicelib/devices/mos3/Makefile.am
@ -34,5 +34,5 @@ libmos3_a_SOURCES = 	\
 	mos3trun.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mos6/Makefile.am
+++ b/src/spicelib/devices/mos6/Makefile.am
@ -23,5 +23,5 @@ libmos6_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/mos9/Makefile.am
+++ b/src/spicelib/devices/mos9/Makefile.am
@ -35,5 +35,5 @@ libmos9_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/nbjt/Makefile.am
+++ b/src/spicelib/devices/nbjt/Makefile.am
@ -25,6 +25,6 @@ libnbjt_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/nbjt2/Makefile.am
+++ b/src/spicelib/devices/nbjt2/Makefile.am
@ -25,6 +25,6 @@ libnbjt2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/ndev/Makefile.am
+++ b/src/spicelib/devices/ndev/Makefile.am
@ -25,6 +25,6 @@ libndev_a_SOURCES = 	\
 	ndevtrun.c	


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/numd/Makefile.am
+++ b/src/spicelib/devices/numd/Makefile.am
@ -24,6 +24,6 @@ libnumd_a_SOURCES = 	\
 	numdtrun.c	


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/numd2/Makefile.am
+++ b/src/spicelib/devices/numd2/Makefile.am
@ -25,6 +25,6 @@ libnumd2_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/numos/Makefile.am
+++ b/src/spicelib/devices/numos/Makefile.am
@ -25,6 +25,6 @@ libnumos_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/res/Makefile.am
+++ b/src/spicelib/devices/res/Makefile.am
@ -28,5 +28,5 @@ libres_a_SOURCES = 		\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/soi3/Makefile.am
+++ b/src/spicelib/devices/soi3/Makefile.am
@ -28,5 +28,5 @@ libsoi3_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/sw/Makefile.am
+++ b/src/spicelib/devices/sw/Makefile.am
@ -25,5 +25,5 @@ libsw_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/tra/Makefile.am
+++ b/src/spicelib/devices/tra/Makefile.am
@ -22,5 +22,5 @@ libtra_a_SOURCES = 	\
 	tratrunc.c


-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/txl/Makefile.am
+++ b/src/spicelib/devices/txl/Makefile.am
@ -21,6 +21,6 @@ libtxl_a_SOURCES = 	\
 	txlsetup.c \
 	txlinit.c
    
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/urc/Makefile.am
+++ b/src/spicelib/devices/urc/Makefile.am
@ -20,5 +20,5 @@ liburc_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/vbic/Makefile.am
+++ b/src/spicelib/devices/vbic/Makefile.am
@ -28,6 +28,6 @@ libvbic_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/vccs/Makefile.am
+++ b/src/spicelib/devices/vccs/Makefile.am
@ -24,5 +24,5 @@ libvccs_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/vcvs/Makefile.am
+++ b/src/spicelib/devices/vcvs/Makefile.am
@ -25,5 +25,5 @@ libvcvs_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/devices/vsrc/Makefile.am
+++ b/src/spicelib/devices/vsrc/Makefile.am
@ -25,6 +25,6 @@ libvsrc_a_SOURCES = 	\



-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@ -66,6 +66,6 @@ libinp_a_SOURCES = \
 		inp.h


-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/xspice/cm/Makefile.am
+++ b/src/xspice/cm/Makefile.am
@ -13,6 +13,6 @@ cmexport.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
--- a/src/xspice/enh/Makefile.am
+++ b/src/xspice/enh/Makefile.am
@ -8,6 +8,6 @@ libenhxsp_a_SOURCES = \
 enh.c  \
 enhtrans.c

-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/xspice/evt/Makefile.am
+++ b/src/xspice/evt/Makefile.am
@ -22,6 +22,6 @@ evtplot.c  \
 evtqueue.c  \
 evttermi.c

-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/xspice/icm/Makefile.am
+++ b/src/xspice/icm/Makefile.am
@ -5,7 +5,7 @@

 SUBDIRS = icm_spice2poly

-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in

--- a/src/xspice/idn/Makefile.am
+++ b/src/xspice/idn/Makefile.am
@ -7,6 +7,6 @@ noinst_LIBRARIES = libidnxsp.a
 libidnxsp_a_SOURCES = \
 	idndig.c

-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/xspice/ipc/Makefile.am
+++ b/src/xspice/ipc/Makefile.am
@ -11,6 +11,6 @@ ipcsockets.c \
 ipcstdio.c   \
 ipctiein.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
--- a/src/xspice/mif/Makefile.am
+++ b/src/xspice/mif/Makefile.am
@ -21,6 +21,6 @@ libmifxsp_a_SOURCES = \
 	mifdestr.c \
 	mif.c

-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include

 MAINTAINERCLEANFILES = Makefile.in