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

fix another missing dependencies problem

This commit is contained in:
rlar 2010-11-16 19:38:18 +00:00
parent 7d1950e131
commit d768b25ab7
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-16 Robert Larice
* src/Makefile.am :
fix another missing dependencies problem
handcraftet compilation rules caused this problem with main.c/spice.o
a `make distclean' might be appropriate after this CVS checkout
2010-11-16 Robert Larice 2010-11-16 Robert Larice
* configure.ac , * configure.ac ,
* src/Makefile.am , * src/Makefile.am ,

1
configure.ac
View File

@ -457,6 +457,7 @@ AC_SUBST(TCL_LIB_SPEC)
dnl Checks for programs dnl Checks for programs
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AM_PROG_CC_C_O
## AM_PROG_LIBTOOL ## AM_PROG_LIBTOOL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL

35
src/Makefile.am
View File

@ -27,7 +27,7 @@ endif !TCL_MODULE
EXTRA_DIST = ngspice.txt setplot spectrum \ EXTRA_DIST = ngspice.txt setplot spectrum \
devload devaxis ciderinit winmain.c unsupported \ devload devaxis ciderinit winmain.c unsupported \
tclspice.c tclspice.map pkgIndex.tcl.in tclspinit.in tclspice.c tclspice.map pkgIndex.tcl.in tclspinit.in main.c
initdatadir = $(pkgdatadir)/scripts initdatadir = $(pkgdatadir)/scripts
@ -95,16 +95,18 @@ DYNAMIC_DEVICELIBS = \
## Build ngspice first: ## Build ngspice first:
ngspice_SOURCES = \ ngspice_SOURCES = \
main.c \
conf.c \ conf.c \
conf.h \ conf.h \
ngspice.c ngspice.c
ngspice_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR
if WINDOWS if WINDOWS
ngspice_SOURCES += winmain.c ngspice_SOURCES += winmain.c
endif endif
ngspice_LDADD = \ ngspice_LDADD = \
spice.lo \
frontend/libfte.la frontend/libfte.la
if WINDOWS if WINDOWS
@ -179,12 +181,6 @@ ngspice_LDADD += frontend/help/libhlp.la
endif endif
endif endif
winmain.o: winmain.c ../config.h
$(COMPILE) -DSIMULATOR -o winmain.o -c $(srcdir)/winmain.c
spice.lo: main.c ../config.h
$(LTCOMPILE) -DSIMULATOR -c -o spice.o $<
## nutmeg: ## nutmeg:
@ -194,6 +190,8 @@ ngnutmeg_SOURCES = \
conf.h \ conf.h \
ngnutmeg.c ngnutmeg.c
ngnutmeg_CPPFLAGS = $(AM_CPPFLAGS)
if WINDOWS if WINDOWS
ngnutmeg_SOURCES += winmain.c ngnutmeg_SOURCES += winmain.c
endif endif
@ -311,10 +309,17 @@ if TCLWIN
LIBS += -lpsapi -ltcl84 -lBLT24 LIBS += -lpsapi -ltcl84 -lBLT24
endif endif
libspice_la_SOURCES = libspice_la_SOURCES = \
main.c \
conf.c \
conf.h \
ngspice.c \
tclspice.c
libspice_la_LIBADD = ngspice.lo conf.lo \ libspice_la_CPPFLAGS = $(AM_CPPFLAGS) -DSIMULATOR \
spice.lo \ -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\""
libspice_la_LIBADD = \
@X_LIBS@ \ @X_LIBS@ \
frontend/libfte.la frontend/libfte.la
@ -337,7 +342,7 @@ libspice_la_LIBADD += \
if NDEV_WANTED if NDEV_WANTED
libspice_la_LIBADD += \ libspice_la_LIBADD += \
spicelib/devices/ndev/libndev.la spicelib/devices/ndev/libndev.la
endif endif
if NUMDEV_WANTED if NUMDEV_WANTED
@ -383,7 +388,7 @@ libspice_la_LIBADD += \
maths/ni/libni.la \ maths/ni/libni.la \
maths/sparse/libsparse.la \ maths/sparse/libsparse.la \
misc/libmisc.la \ misc/libmisc.la \
tclspice.lo $(LIBS) $(LIBS)
libspice_la_CFLAGS = $(AM_CFLAGS) libspice_la_CFLAGS = $(AM_CFLAGS)
libspice_la_LDFLAGS = -shared -Wl,--version-script=tclspice.map libspice_la_LDFLAGS = -shared -Wl,--version-script=tclspice.map
@ -422,10 +427,6 @@ install-tclspice:
$(mkinstalldirs) $(DESTDIR)$(libdir)/spice $(mkinstalldirs) $(DESTDIR)$(libdir)/spice
$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir)/spice $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir)/spice
tclspice.lo: tclspice.c
$(LTCOMPILE) -DTCLSPICE_version="\"$(TCLSPICE_VERSION)\"" -MT tclspice.lo -MD -MP -MF $(DEPDIR)/tclspice.Tpo -c -o tclspice.o $<
mv -f $(DEPDIR)/tclspice.Tpo $(DEPDIR)/tclspice.Plo
endif TCL_MODULE endif TCL_MODULE
EXTRA_DIST += spice.def EXTRA_DIST += spice.def