luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

internal help: it is only available when --enable-oldapps is given 

ngnutmeg is only made when --enable-oldapps is given during ./configure
This commit is contained in:
Holger Vogt 2018-05-21 00:54:31 +02:00
parent 0cb71b21bb
commit f4f389dabb
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compile_min.sh
View File

@ -18,6 +18,7 @@
# Please see http://ngspice.sourceforge.net/admshowto.html for more info on adms. # Please see http://ngspice.sourceforge.net/admshowto.html for more info on adms.
# CIDER, XSPICE, and OpenMP may be selected at will. # CIDER, XSPICE, and OpenMP may be selected at will.
# --disable-debug will give O2 optimization (versus O0 for debug) and removes all debugging info. # --disable-debug will give O2 optimization (versus O0 for debug) and removes all debugging info.
# --enable-oldapps will make ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx in addition to ngspice
# ngspice as shared library: # ngspice as shared library:
# Replace --with-wingui by --with-ngshared in line ../configure ... . # Replace --with-wingui by --with-ngshared in line ../configure ... .

6
configure.ac
View File

@ -687,9 +687,11 @@ AM_CONDITIONAL([NO_HELP], [test "x$has_no_help" = xtrue])
# enabling making of the old and outdated applications # enabling making of the old and outdated applications
# ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp # ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp
if test "x$enable_oldapps" = xyes ; then if test "x$enable_oldapps" = xyes ; then
AC_MSG_RESULT([ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are made.]) AC_MSG_RESULT([ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are made.])
else else
AC_MSG_RESULT([ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are not made.]) AC_MSG_RESULT([ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx nghelp are not made.])
AC_MSG_RESULT([No internal help available.])
AC_DEFINE([NOINTHELP], [1], [Internal (old) help not available])
fi fi
AM_CONDITIONAL([OLDAPPS], [test "x$enable_oldapps" = xyes]) AM_CONDITIONAL([OLDAPPS], [test "x$enable_oldapps" = xyes])

9
src/Makefile.am
View File

@ -17,11 +17,11 @@ endif
if !TCL_MODULE if !TCL_MODULE
if !SHARED_MODULE if !SHARED_MODULE
bin_PROGRAMS = ngspice ngnutmeg bin_PROGRAMS = ngspice
if OLDAPPS if OLDAPPS
if !WINGUI if !WINGUI
bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec ngmakeidx bin_PROGRAMS += ngnutmeg ngsconvert ngproc2mod ngmultidec ngmakeidx
helpdatadir = $(pkgdatadir)/helpdir helpdatadir = $(pkgdatadir)/helpdir
helpdata_DATA = ngspice.txt ngspice.idx helpdata_DATA = ngspice.txt ngspice.idx
if !NO_HELP if !NO_HELP
@ -190,7 +190,7 @@ ngspice_LDADD += frontend/help/libhlp.la
endif endif
endif endif
if OLDAPPS
## nutmeg: ## nutmeg:
ngnutmeg_SOURCES = \ ngnutmeg_SOURCES = \
@ -229,7 +229,6 @@ ngnutmeg_LDADD += \
## These programs are not required on Windows ## These programs are not required on Windows
if !WINGUI if !WINGUI
if !SHWIN if !SHWIN
if OLDAPPS
if !NO_X if !NO_X
ngnutmeg_LDADD += \ ngnutmeg_LDADD += \
@ -294,9 +293,9 @@ ngmakeidx_SOURCES = makeidx.c
ngspice.idx: ngmakeidx$(EXEEXT) $(srcdir)/ngspice.txt ngspice.idx: ngmakeidx$(EXEEXT) $(srcdir)/ngspice.txt
./ngmakeidx$(EXEEXT) -o ngspice.idx $(srcdir)/ngspice.txt ./ngmakeidx$(EXEEXT) -o ngspice.idx $(srcdir)/ngspice.txt
endif OLDAPPS
endif !SHWIN endif !SHWIN
endif !WINGUI endif !WINGUI
endif OLDAPPS
if RELPATH if RELPATH
spinitpath=../lib/ngspice spinitpath=../lib/ngspice

2
src/frontend/com_ghelp.c
View File

@ -13,7 +13,7 @@
void void
com_ghelp(wordlist *wl) com_ghelp(wordlist *wl)
{ {
#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) || defined(X_DISPLAY_MISSING) #if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) || defined(X_DISPLAY_MISSING) || defined(NOINTHELP)
NG_IGNORE(wl); NG_IGNORE(wl);