From cded776aa62e4c785f374e32209fa15270628585 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sat, 7 May 2011 08:01:22 +0000
Subject: [PATCH] few build changes

---
 ChangeLog                   | 6 ++++++
 src/Makefile.am             | 8 ++------
 src/xspice/cmpp/Makefile.am | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83206311b..4cbc23d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-07  Dietmar Warning
+ * src/Makefile.am: change lib order for linking with gcc4 to prevent 
+   unresolved symbols
+ * xspice/cmpp/Makefile.am: there are flex'es, which not accept "-o outfile"
+   but accept "-ooutfile"
+
 2011-05-05  Dietmar Warning
  * spicelib/devices/bsim3v32/*.c, *.h: allow delvto and mulu0 as instance 
    parameter, usefull for stress amn mismatch simulations
diff --git a/src/Makefile.am b/src/Makefile.am
index 21f894bb5..97d404be5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,12 +115,6 @@ endif
 ngspice_LDADD += \
 	frontend/plotting/libplotting.la
 
-if XSPICE_WANTED
-ngspice_LDADD += \
-	xspice/cm/libcmxsp.la \
-	xspice/mif/libmifxsp.la
-endif
-
 ngspice_LDADD += \
 	spicelib/devices/dev.lo \
 	$(DYNAMIC_DEVICELIBS)
@@ -144,6 +138,8 @@ ngspice_LDADD += \
 
 if XSPICE_WANTED
 ngspice_LDADD += \
+	xspice/cm/libcmxsp.la \
+	xspice/mif/libmifxsp.la \
 	xspice/evt/libevtxsp.la \
 	xspice/enh/libenhxsp.la \
 	xspice/ipc/libipcxsp.la \
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index 7d087462e..fa03d5ffe 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -17,11 +17,11 @@ cmpp_SOURCES = cmpp.h main.c pp_ifs.c pp_lst.c pp_mod.c read_ifs.c util.c \
 
 mod_lex.o : mod_yacc.h
 mod_lex.c : mod_lex.l
-	$(LEX)  -o $@  $<
+	$(LEX)  -o$@  $<
 
 ifs_lex.o : ifs_yacc.h
 ifs_lex.c : ifs_lex.l
-	$(LEX)  -o $@  $<
+	$(LEX)  -o$@  $<
 
 ifs_yacc.c ifs_yacc.h : ifs_yacc.y
 	$(BISON) $(BISONFLAGS) -d -o ifs_yacc.c $<