xpsice, use the CFLAGS when linking .cm code models

src/xspice/icm/GNUmakefile.in

@@ -87,7 +87,7 @@ cm-clean :
 #-----
 
 $(cm)/$(cm).cm : $(cm-objs)
-	$(CC) $(LDFLAGS) -o $@  $(cm-objs)
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $^ -o $@
 
 # "order-only" prerequisites
 #   (info "(make) Prerequisite Types")
@@ -129,7 +129,7 @@ define do-deps
 	rm $$x.pp
 endef
 
-COMPILE = $(CC) $(INCLUDES) -I$(cm) -I$(srcdir)/$(cm) $(CFLAGS)
+COMPILE = $(CC) $(INCLUDES) -I$(cm) -I$(srcdir)/$(cm) $(CFLAGS) $(EXTRA_CFLAGS)
 
 $(cm)/dlmain.o : $(srcdir)/dlmain.c $(cm-descr)
 	$(COMPILE) $(gen_pp)  -o $@ -c $<

src/xspice/icm/makedefs.in

@@ -14,25 +14,26 @@ uname = $(shell uname)
 
 # C compiler to use
 CC = @CC@
+CFLAGS = @CFLAGS@
 
 # Spice header include path
 INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 # CFLAGS to use here
-CFLAGS = @CFLAGS@ -fPIC
+EXTRA_CFLAGS = -fPIC
 DEPFLAGS = -MD -MF
 ISMINGW = $(shell uname | grep -c "MINGW32")
 ifeq ($(ISMINGW), 1)
-  CFLAGS = @CFLAGS@
+  EXTRA_CFLAGS =
 endif
 ISCYGWIN = $(shell uname | grep -c "CYGWIN")
 ifeq ($(ISCYGWIN), 1)
-  CFLAGS = @CFLAGS@
+  EXTRA_CFLAGS =
 endif
 ISSUNOS = $(shell uname | grep -c "SunOS")
 ifeq ($(ISSUNOS), 1)
   ifneq "$(CC)" "gcc"
-    CFLAGS = @CFLAGS@ -KPIC
+    EXTRA_CFLAGS = -KPIC
     DEPFLAGS = -xMD -xMF
   endif
 endif