diff --git a/src/ciderlib/input/Makefile.am b/src/ciderlib/input/Makefile.am
index a3abb280a..5288e21b2 100644
--- a/src/ciderlib/input/Makefile.am
+++ b/src/ciderlib/input/Makefile.am
@@ -30,4 +30,5 @@ libciderinput_la_SOURCES =	\
 
 EXTRA_DIST = readme
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/ciderlib/oned/Makefile.am b/src/ciderlib/oned/Makefile.am
index bbfeca450..ce9e4200b 100644
--- a/src/ciderlib/oned/Makefile.am
+++ b/src/ciderlib/oned/Makefile.am
@@ -22,4 +22,5 @@ libcideroned_la_SOURCES =	\
 
 EXTRA_DIST = notes readme
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/ciderlib/support/Makefile.am b/src/ciderlib/support/Makefile.am
index 5f489de75..c4d277df3 100644
--- a/src/ciderlib/support/Makefile.am
+++ b/src/ciderlib/support/Makefile.am
@@ -18,6 +18,7 @@ libcidersuprt_la_SOURCES =	\
 		suprmitf.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = readme
diff --git a/src/ciderlib/twod/Makefile.am b/src/ciderlib/twod/Makefile.am
index cab817d6c..6e42d4d8c 100644
--- a/src/ciderlib/twod/Makefile.am
+++ b/src/ciderlib/twod/Makefile.am
@@ -30,4 +30,5 @@ libcidertwod_la_SOURCES =	\
 
 EXTRA_DIST = readme
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index a72cc0214..f5a07666c 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -194,6 +194,7 @@ libfte_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include @X_CFLAGS@
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/frontend/help/Makefile.am b/src/frontend/help/Makefile.am
index 647a96082..ed7e61e0a 100644
--- a/src/frontend/help/Makefile.am
+++ b/src/frontend/help/Makefile.am
@@ -15,6 +15,7 @@ libhlp_la_SOURCES = \
 
 
 libhlp_la_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include @X_CFLAGS@
+libhlp_la_CFLAGS = $(STATIC)
 
 endif
 
diff --git a/src/frontend/numparam/Makefile.am b/src/frontend/numparam/Makefile.am
index b065bac21..9ca6fdef5 100644
--- a/src/frontend/numparam/Makefile.am
+++ b/src/frontend/numparam/Makefile.am
@@ -13,4 +13,5 @@ libnumparam_la_SOURCES = \
 	numparam.h
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/parser/Makefile.am b/src/frontend/parser/Makefile.am
index 580831fc6..cc229c5ba 100644
--- a/src/frontend/parser/Makefile.am
+++ b/src/frontend/parser/Makefile.am
@@ -23,4 +23,5 @@ libparser_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am
index e17468958..055cb75d3 100644
--- a/src/frontend/plotting/Makefile.am
+++ b/src/frontend/plotting/Makefile.am
@@ -32,5 +32,6 @@ libplotting_la_SOURCES += \
 endif
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend @X_CFLAGS@
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/trannoise/Makefile.am b/src/frontend/trannoise/Makefile.am
index afc764904..0ed6ef3b6 100644
--- a/src/frontend/trannoise/Makefile.am
+++ b/src/frontend/trannoise/Makefile.am
@@ -8,5 +8,6 @@ libtrannoise_la_SOURCES = \
 	wallace.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/frontend/wdisp/Makefile.am b/src/frontend/wdisp/Makefile.am
index 8894cecac..423164907 100644
--- a/src/frontend/wdisp/Makefile.am
+++ b/src/frontend/wdisp/Makefile.am
@@ -11,5 +11,6 @@ libwindisp_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend/wdisp
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/cmaths/Makefile.am b/src/maths/cmaths/Makefile.am
index f5985bd30..a6fd74257 100644
--- a/src/maths/cmaths/Makefile.am
+++ b/src/maths/cmaths/Makefile.am
@@ -56,5 +56,6 @@ endif !WINDOWS
 endif !TCL_MODULE
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/maths/poly
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/deriv/Makefile.am b/src/maths/deriv/Makefile.am
index d7a3f6fb6..a520cf5c7 100644
--- a/src/maths/deriv/Makefile.am
+++ b/src/maths/deriv/Makefile.am
@@ -20,4 +20,5 @@ libderiv_la_SOURCES =		\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/fft/Makefile.am b/src/maths/fft/Makefile.am
index 03b3a43bd..28f01f57a 100644
--- a/src/maths/fft/Makefile.am
+++ b/src/maths/fft/Makefile.am
@@ -13,4 +13,5 @@ EXTRA_DIST = NOTE Read-Me
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/misc/Makefile.am b/src/maths/misc/Makefile.am
index ea8c18d0a..5f68ef979 100644
--- a/src/maths/misc/Makefile.am
+++ b/src/maths/misc/Makefile.am
@@ -21,5 +21,6 @@ libmathmisc_la_SOURCES = \
 EXTRA_DIST = test_accuracy.c test_erfc.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/ni/Makefile.am b/src/maths/ni/Makefile.am
index 6ef68d05c..fd33403b0 100644
--- a/src/maths/ni/Makefile.am
+++ b/src/maths/ni/Makefile.am
@@ -32,5 +32,6 @@ libni_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/poly/Makefile.am b/src/maths/poly/Makefile.am
index ebb76ef96..baad9a2f6 100644
--- a/src/maths/poly/Makefile.am
+++ b/src/maths/poly/Makefile.am
@@ -15,5 +15,6 @@ libpoly_la_SOURCES = \
 EXTRA_DIST = poly.h
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am
index 7b195bc25..6e5cdc493 100644
--- a/src/maths/sparse/Makefile.am
+++ b/src/maths/sparse/Makefile.am
@@ -19,5 +19,6 @@ libsparse_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index 9d2534e25..ad8b9a58a 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -35,4 +35,5 @@ libmisc_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am
index de3ea3002..0799ada1b 100644
--- a/src/spicelib/analysis/Makefile.am
+++ b/src/spicelib/analysis/Makefile.am
@@ -109,4 +109,5 @@ endif
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@  -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index cb165f95a..4a36fc49f 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -135,5 +135,6 @@ libdev_la_SOURCES =	\
 EXTRA_DIST = @NOTVLADEVDIR@
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/adms/admst/ngspice.xml b/src/spicelib/devices/adms/admst/ngspice.xml
index 82f17fa79..6d6102a14 100644
--- a/src/spicelib/devices/adms/admst/ngspice.xml
+++ b/src/spicelib/devices/adms/admst/ngspice.xml
@@ -3246,6 +3246,7 @@ CLEANFILES = \\
 	*.xml
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I\$(top_srcdir)/src/include
+AM_CFLAGS = \$(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 4c87e1de0..8d08cf5bb 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -73,6 +73,7 @@ CLEANFILES = \\
 	$(module)getic.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I\$(top_srcdir)/src/include
+AM_CFLAGS = \$(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/asrc/Makefile.am b/src/spicelib/devices/asrc/Makefile.am
index a5db57d78..01f292d21 100644
--- a/src/spicelib/devices/asrc/Makefile.am
+++ b/src/spicelib/devices/asrc/Makefile.am
@@ -24,4 +24,5 @@ libasrc_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bjt/Makefile.am b/src/spicelib/devices/bjt/Makefile.am
index 9ffb614d1..8b4ab3664 100644
--- a/src/spicelib/devices/bjt/Makefile.am
+++ b/src/spicelib/devices/bjt/Makefile.am
@@ -37,5 +37,6 @@ libbjt_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim1/Makefile.am b/src/spicelib/devices/bsim1/Makefile.am
index 380317a93..da088cf5b 100644
--- a/src/spicelib/devices/bsim1/Makefile.am
+++ b/src/spicelib/devices/bsim1/Makefile.am
@@ -33,4 +33,5 @@ libbsim1_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim2/Makefile.am b/src/spicelib/devices/bsim2/Makefile.am
index 28add40d4..ea8ae9855 100644
--- a/src/spicelib/devices/bsim2/Makefile.am
+++ b/src/spicelib/devices/bsim2/Makefile.am
@@ -31,5 +31,6 @@ libbsim2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3/Makefile.am b/src/spicelib/devices/bsim3/Makefile.am
index 4dbcad83c..2871b0f2e 100644
--- a/src/spicelib/devices/bsim3/Makefile.am
+++ b/src/spicelib/devices/bsim3/Makefile.am
@@ -30,6 +30,7 @@ libbsim3_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim3soi/Makefile.am b/src/spicelib/devices/bsim3soi/Makefile.am
index 438ebd6e2..7a7ed8ea0 100644
--- a/src/spicelib/devices/bsim3soi/Makefile.am
+++ b/src/spicelib/devices/bsim3soi/Makefile.am
@@ -30,6 +30,7 @@ libbsim4soi_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim3soi_dd/Makefile.am b/src/spicelib/devices/bsim3soi_dd/Makefile.am
index f3ec6cc78..5187d67e3 100644
--- a/src/spicelib/devices/bsim3soi_dd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_dd/Makefile.am
@@ -30,6 +30,7 @@ libbsim3soidd_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim3soi_fd/Makefile.am b/src/spicelib/devices/bsim3soi_fd/Makefile.am
index 46a4d71b0..aac0e863a 100644
--- a/src/spicelib/devices/bsim3soi_fd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_fd/Makefile.am
@@ -30,6 +30,7 @@ libbsim3soifd_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim3soi_pd/Makefile.am b/src/spicelib/devices/bsim3soi_pd/Makefile.am
index 9f215e499..f363b1d0e 100644
--- a/src/spicelib/devices/bsim3soi_pd/Makefile.am
+++ b/src/spicelib/devices/bsim3soi_pd/Makefile.am
@@ -30,6 +30,7 @@ libbsim3soipd_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim3v0/Makefile.am b/src/spicelib/devices/bsim3v0/Makefile.am
index 65ab7ad12..4db27a86d 100644
--- a/src/spicelib/devices/bsim3v0/Makefile.am
+++ b/src/spicelib/devices/bsim3v0/Makefile.am
@@ -29,5 +29,6 @@ libbsim3v0_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v1/Makefile.am b/src/spicelib/devices/bsim3v1/Makefile.am
index df9ce36d4..9ede60cb9 100644
--- a/src/spicelib/devices/bsim3v1/Makefile.am
+++ b/src/spicelib/devices/bsim3v1/Makefile.am
@@ -30,5 +30,6 @@ libbsim3v1_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/bsim3v32/Makefile.am b/src/spicelib/devices/bsim3v32/Makefile.am
index fe45caa65..37674d382 100644
--- a/src/spicelib/devices/bsim3v32/Makefile.am
+++ b/src/spicelib/devices/bsim3v32/Makefile.am
@@ -30,6 +30,7 @@ libbsim3v32_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim4/Makefile.am b/src/spicelib/devices/bsim4/Makefile.am
index 8f87fc2ac..9403a4129 100644
--- a/src/spicelib/devices/bsim4/Makefile.am
+++ b/src/spicelib/devices/bsim4/Makefile.am
@@ -31,6 +31,7 @@ libbsim4_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim4v4/Makefile.am b/src/spicelib/devices/bsim4v4/Makefile.am
index 8838acaa9..a4f55eb42 100644
--- a/src/spicelib/devices/bsim4v4/Makefile.am
+++ b/src/spicelib/devices/bsim4v4/Makefile.am
@@ -31,6 +31,7 @@ libbsim4v4_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim4v5/Makefile.am b/src/spicelib/devices/bsim4v5/Makefile.am
index da4be82c2..a7ab65505 100644
--- a/src/spicelib/devices/bsim4v5/Makefile.am
+++ b/src/spicelib/devices/bsim4v5/Makefile.am
@@ -31,6 +31,7 @@ libbsim4v5_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/bsim4v6/Makefile.am b/src/spicelib/devices/bsim4v6/Makefile.am
index fa576c0f2..0815d57eb 100644
--- a/src/spicelib/devices/bsim4v6/Makefile.am
+++ b/src/spicelib/devices/bsim4v6/Makefile.am
@@ -31,6 +31,7 @@ libbsim4v6_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/spicelib/devices/cap/Makefile.am b/src/spicelib/devices/cap/Makefile.am
index 4dbe33f76..78d8daaff 100644
--- a/src/spicelib/devices/cap/Makefile.am
+++ b/src/spicelib/devices/cap/Makefile.am
@@ -32,5 +32,6 @@ libcap_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cccs/Makefile.am b/src/spicelib/devices/cccs/Makefile.am
index b9edf74f7..566cb2774 100644
--- a/src/spicelib/devices/cccs/Makefile.am
+++ b/src/spicelib/devices/cccs/Makefile.am
@@ -25,4 +25,5 @@ libcccs_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ccvs/Makefile.am b/src/spicelib/devices/ccvs/Makefile.am
index 058496b45..3e72d2145 100644
--- a/src/spicelib/devices/ccvs/Makefile.am
+++ b/src/spicelib/devices/ccvs/Makefile.am
@@ -26,5 +26,6 @@ libccvs_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/cpl/Makefile.am b/src/spicelib/devices/cpl/Makefile.am
index 6d9a37fa7..821850061 100644
--- a/src/spicelib/devices/cpl/Makefile.am
+++ b/src/spicelib/devices/cpl/Makefile.am
@@ -20,5 +20,6 @@ libcpl_la_SOURCES = \
 	cplinit.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/csw/Makefile.am b/src/spicelib/devices/csw/Makefile.am
index 6143f273e..715d29da5 100644
--- a/src/spicelib/devices/csw/Makefile.am
+++ b/src/spicelib/devices/csw/Makefile.am
@@ -26,4 +26,5 @@ libcsw_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/dio/Makefile.am b/src/spicelib/devices/dio/Makefile.am
index ff2b1a59d..7218d39b0 100644
--- a/src/spicelib/devices/dio/Makefile.am
+++ b/src/spicelib/devices/dio/Makefile.am
@@ -35,4 +35,5 @@ libdio_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet1/Makefile.am b/src/spicelib/devices/hfet1/Makefile.am
index 226ad14d3..5d9ef9eee 100644
--- a/src/spicelib/devices/hfet1/Makefile.am
+++ b/src/spicelib/devices/hfet1/Makefile.am
@@ -27,4 +27,5 @@ libhfet_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hfet2/Makefile.am b/src/spicelib/devices/hfet2/Makefile.am
index faec1ff5d..743fae0a2 100644
--- a/src/spicelib/devices/hfet2/Makefile.am
+++ b/src/spicelib/devices/hfet2/Makefile.am
@@ -27,4 +27,5 @@ libhfet2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hisim2/Makefile.am b/src/spicelib/devices/hisim2/Makefile.am
index 3747c1fd3..33fff2074 100644
--- a/src/spicelib/devices/hisim2/Makefile.am
+++ b/src/spicelib/devices/hisim2/Makefile.am
@@ -32,5 +32,6 @@ libhisim2_la_SOURCES =	hisim2.h	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/hisimhv/Makefile.am b/src/spicelib/devices/hisimhv/Makefile.am
index 3f100ea12..a270cfef2 100644
--- a/src/spicelib/devices/hisimhv/Makefile.am
+++ b/src/spicelib/devices/hisimhv/Makefile.am
@@ -32,5 +32,6 @@ libhisimhv_la_SOURCES = hisimhv.h	\
 			hsmhvtrunc.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ind/Makefile.am b/src/spicelib/devices/ind/Makefile.am
index d7c26f4ed..5a05ee97b 100644
--- a/src/spicelib/devices/ind/Makefile.am
+++ b/src/spicelib/devices/ind/Makefile.am
@@ -42,4 +42,5 @@ libind_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/isrc/Makefile.am b/src/spicelib/devices/isrc/Makefile.am
index 811e5f9c3..90443bfc7 100644
--- a/src/spicelib/devices/isrc/Makefile.am
+++ b/src/spicelib/devices/isrc/Makefile.am
@@ -22,4 +22,5 @@ libisrc_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet/Makefile.am b/src/spicelib/devices/jfet/Makefile.am
index 514a75b7e..fc4907373 100644
--- a/src/spicelib/devices/jfet/Makefile.am
+++ b/src/spicelib/devices/jfet/Makefile.am
@@ -30,4 +30,5 @@ libjfet_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/jfet2/Makefile.am b/src/spicelib/devices/jfet2/Makefile.am
index f116e27b6..f8789cd9b 100644
--- a/src/spicelib/devices/jfet2/Makefile.am
+++ b/src/spicelib/devices/jfet2/Makefile.am
@@ -31,4 +31,5 @@ libjfet2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ltra/Makefile.am b/src/spicelib/devices/ltra/Makefile.am
index 60412b31c..42a9c042a 100644
--- a/src/spicelib/devices/ltra/Makefile.am
+++ b/src/spicelib/devices/ltra/Makefile.am
@@ -27,4 +27,5 @@ libltra_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mes/Makefile.am b/src/spicelib/devices/mes/Makefile.am
index a944625bd..3d0c3b3d5 100644
--- a/src/spicelib/devices/mes/Makefile.am
+++ b/src/spicelib/devices/mes/Makefile.am
@@ -30,4 +30,5 @@ libmes_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mesa/Makefile.am b/src/spicelib/devices/mesa/Makefile.am
index a7b210b31..79e6f7555 100644
--- a/src/spicelib/devices/mesa/Makefile.am
+++ b/src/spicelib/devices/mesa/Makefile.am
@@ -27,4 +27,5 @@ libmesa_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos1/Makefile.am b/src/spicelib/devices/mos1/Makefile.am
index 85f41f392..e523c113c 100644
--- a/src/spicelib/devices/mos1/Makefile.am
+++ b/src/spicelib/devices/mos1/Makefile.am
@@ -36,4 +36,5 @@ libmos1_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos2/Makefile.am b/src/spicelib/devices/mos2/Makefile.am
index 2036ec3f3..a27ddc9d2 100644
--- a/src/spicelib/devices/mos2/Makefile.am
+++ b/src/spicelib/devices/mos2/Makefile.am
@@ -35,4 +35,5 @@ libmos2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos3/Makefile.am b/src/spicelib/devices/mos3/Makefile.am
index 3e72d88af..7419051a9 100644
--- a/src/spicelib/devices/mos3/Makefile.am
+++ b/src/spicelib/devices/mos3/Makefile.am
@@ -35,4 +35,5 @@ libmos3_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos6/Makefile.am b/src/spicelib/devices/mos6/Makefile.am
index 7d5f2cc33..5161dbac3 100644
--- a/src/spicelib/devices/mos6/Makefile.am
+++ b/src/spicelib/devices/mos6/Makefile.am
@@ -24,4 +24,5 @@ libmos6_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/mos9/Makefile.am b/src/spicelib/devices/mos9/Makefile.am
index de8b3dadb..5db83e4c0 100644
--- a/src/spicelib/devices/mos9/Makefile.am
+++ b/src/spicelib/devices/mos9/Makefile.am
@@ -36,4 +36,5 @@ libmos9_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/nbjt/Makefile.am b/src/spicelib/devices/nbjt/Makefile.am
index 7e2094da3..4a5c3ee8a 100644
--- a/src/spicelib/devices/nbjt/Makefile.am
+++ b/src/spicelib/devices/nbjt/Makefile.am
@@ -26,5 +26,6 @@ libnbjt_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/nbjt2/Makefile.am b/src/spicelib/devices/nbjt2/Makefile.am
index cd728ac51..08ed45a07 100644
--- a/src/spicelib/devices/nbjt2/Makefile.am
+++ b/src/spicelib/devices/nbjt2/Makefile.am
@@ -26,5 +26,6 @@ libnbjt2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/ndev/Makefile.am b/src/spicelib/devices/ndev/Makefile.am
index bd3d78793..ce0f7deee 100644
--- a/src/spicelib/devices/ndev/Makefile.am
+++ b/src/spicelib/devices/ndev/Makefile.am
@@ -27,5 +27,6 @@ libndev_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numd/Makefile.am b/src/spicelib/devices/numd/Makefile.am
index 9a053c8c7..a9c263e89 100644
--- a/src/spicelib/devices/numd/Makefile.am
+++ b/src/spicelib/devices/numd/Makefile.am
@@ -25,5 +25,6 @@ libnumd_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numd2/Makefile.am b/src/spicelib/devices/numd2/Makefile.am
index 5290b1292..d4734642b 100644
--- a/src/spicelib/devices/numd2/Makefile.am
+++ b/src/spicelib/devices/numd2/Makefile.am
@@ -26,5 +26,6 @@ libnumd2_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/numos/Makefile.am b/src/spicelib/devices/numos/Makefile.am
index d70778251..0517f2552 100644
--- a/src/spicelib/devices/numos/Makefile.am
+++ b/src/spicelib/devices/numos/Makefile.am
@@ -26,5 +26,6 @@ libnumos_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/res/Makefile.am b/src/spicelib/devices/res/Makefile.am
index fb4159e05..c3d8f33ae 100644
--- a/src/spicelib/devices/res/Makefile.am
+++ b/src/spicelib/devices/res/Makefile.am
@@ -29,4 +29,5 @@ libres_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/soi3/Makefile.am b/src/spicelib/devices/soi3/Makefile.am
index da1781bd5..09b1591dd 100644
--- a/src/spicelib/devices/soi3/Makefile.am
+++ b/src/spicelib/devices/soi3/Makefile.am
@@ -29,4 +29,5 @@ libsoi3_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/sw/Makefile.am b/src/spicelib/devices/sw/Makefile.am
index a5b7df1b2..445c1a790 100644
--- a/src/spicelib/devices/sw/Makefile.am
+++ b/src/spicelib/devices/sw/Makefile.am
@@ -26,4 +26,5 @@ libsw_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/tra/Makefile.am b/src/spicelib/devices/tra/Makefile.am
index e92acbc9d..de708838f 100644
--- a/src/spicelib/devices/tra/Makefile.am
+++ b/src/spicelib/devices/tra/Makefile.am
@@ -23,4 +23,5 @@ libtra_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/txl/Makefile.am b/src/spicelib/devices/txl/Makefile.am
index 0e8fd2bba..0e07d1a38 100644
--- a/src/spicelib/devices/txl/Makefile.am
+++ b/src/spicelib/devices/txl/Makefile.am
@@ -22,5 +22,6 @@ libtxl_la_SOURCES = \
 	txlinit.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/urc/Makefile.am b/src/spicelib/devices/urc/Makefile.am
index b7234a891..8b6c10a49 100644
--- a/src/spicelib/devices/urc/Makefile.am
+++ b/src/spicelib/devices/urc/Makefile.am
@@ -21,4 +21,5 @@ liburc_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vbic/Makefile.am b/src/spicelib/devices/vbic/Makefile.am
index a20aa0209..0ea84de4f 100644
--- a/src/spicelib/devices/vbic/Makefile.am
+++ b/src/spicelib/devices/vbic/Makefile.am
@@ -29,5 +29,6 @@ libvbic_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vccs/Makefile.am b/src/spicelib/devices/vccs/Makefile.am
index 1641d2605..145693195 100644
--- a/src/spicelib/devices/vccs/Makefile.am
+++ b/src/spicelib/devices/vccs/Makefile.am
@@ -25,4 +25,5 @@ libvccs_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vcvs/Makefile.am b/src/spicelib/devices/vcvs/Makefile.am
index ea94841f8..8ad37e37b 100644
--- a/src/spicelib/devices/vcvs/Makefile.am
+++ b/src/spicelib/devices/vcvs/Makefile.am
@@ -26,4 +26,5 @@ libvcvs_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/devices/vsrc/Makefile.am b/src/spicelib/devices/vsrc/Makefile.am
index 116526878..28d5fb38b 100644
--- a/src/spicelib/devices/vsrc/Makefile.am
+++ b/src/spicelib/devices/vsrc/Makefile.am
@@ -26,5 +26,6 @@ libvsrc_la_SOURCES =	\
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index 585e71ea8..0683ce675 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -74,5 +74,6 @@ inpptree-parser.c inpptree-parser.h : inpptree-parser.y
 	bison $(srcdir)/inpptree-parser.y
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/cm/Makefile.am b/src/xspice/cm/Makefile.am
index f26c73dda..aa1b36795 100644
--- a/src/xspice/cm/Makefile.am
+++ b/src/xspice/cm/Makefile.am
@@ -14,5 +14,6 @@ libcmxsp_la_SOURCES = \
 
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/enh/Makefile.am b/src/xspice/enh/Makefile.am
index 6f8e1c94b..3660b69eb 100644
--- a/src/xspice/enh/Makefile.am
+++ b/src/xspice/enh/Makefile.am
@@ -9,5 +9,6 @@ libenhxsp_la_SOURCES = \
 	enhtrans.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/evt/Makefile.am b/src/xspice/evt/Makefile.am
index b4f1af956..9eba09fe2 100644
--- a/src/xspice/evt/Makefile.am
+++ b/src/xspice/evt/Makefile.am
@@ -23,5 +23,6 @@ libevtxsp_la_SOURCES = \
 	evttermi.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/idn/Makefile.am b/src/xspice/idn/Makefile.am
index c2809ea2f..3f92ee679 100644
--- a/src/xspice/idn/Makefile.am
+++ b/src/xspice/idn/Makefile.am
@@ -8,5 +8,6 @@ libidnxsp_la_SOURCES = \
 	idndig.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/ipc/Makefile.am b/src/xspice/ipc/Makefile.am
index c31653ec0..40e4650c6 100644
--- a/src/xspice/ipc/Makefile.am
+++ b/src/xspice/ipc/Makefile.am
@@ -12,5 +12,6 @@ libipcxsp_la_SOURCES = \
 	ipctiein.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/mif/Makefile.am b/src/xspice/mif/Makefile.am
index a8f6b8ae8..60b1b6fdf 100644
--- a/src/xspice/mif/Makefile.am
+++ b/src/xspice/mif/Makefile.am
@@ -22,5 +22,6 @@ libmifxsp_la_SOURCES = \
 	mif.c
 
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
+AM_CFLAGS = $(STATIC)
 
 MAINTAINERCLEANFILES = Makefile.in