From 09c9d68a5f0bc2da579e8ce60c1143ddf48051e5 Mon Sep 17 00:00:00 2001 From: pnenzi Date: Fri, 29 Apr 2005 07:06:39 +0000 Subject: [PATCH] Fixed the scripts to avoid the warnings on non-windows systems arising from linking with an empty library. Patch from Steven Borley. --- configure.in | 3 +++ src/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6712ba81c..7bf3ee4a5 100644 --- a/configure.in +++ b/configure.in @@ -373,11 +373,14 @@ dnl redefine the path for WINDOWS: AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo /spice_win/bin`" ) AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo /spice_win/lib`" ) WINMAIN="winmain.o" + WINDISPLIB="frontend/wdisp/libwindisp.a" else WINMAIN="" + WINDISPLIB="" fi AC_SUBST(WINMAIN) +AC_SUBST(WINDISPLIB) # Recapitulate settings: diff --git a/src/Makefile.am b/src/Makefile.am index 6354d044a..ff56e97dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,7 +81,7 @@ ngspice_LDADD = \ @WINMAIN@ \ spice.o \ frontend/libfte.a \ - frontend/wdisp/libwindisp.a \ + @WINDISPLIB@ \ frontend/plotting/libplotting.a \ @XSPICELIB1@ \ spicelib/devices/dev.o \ @@ -120,7 +120,7 @@ ngnutmeg_SOURCES = \ ngnutmeg_LDADD = \ @WINMAIN@ \ frontend/libfte.a \ - frontend/wdisp/libwindisp.a \ + @WINDISPLIB@ \ frontend/plotting/libplotting.a \ frontend/parser/libparser.a \ @NUMPARAMLIB@ \