From: Wolfgang Bangerth Date: Mon, 7 Mar 2005 02:50:58 +0000 (+0000) Subject: Link with the function parser object file as well. X-Git-Tag: v8.0.0~14507 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2db88c73bc502ddd8ca5c0b59b208f1f2c04d3e;p=dealii.git Link with the function parser object file as well. git-svn-id: https://svn.dealii.org/trunk@10021 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index 81adc642d9..19c3deca64 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -17,6 +17,10 @@ h-files = $(sort $(shell echo include/base/*.h)) # get options which hold for all files of the project include $D/common/Make.global_options +# there's an extra .o file for the function parser that we need to link into +# libbase +extra-o-files = $(LIBDIR)/contrib/functionparser/fparser.$(OBJEXT) + # production rules ifneq ($(with-multithreading),no) @@ -40,22 +44,22 @@ libo: $(LIBDIR)/libbase$(lib-suffix) $(LIBDIR)/libbase$(static-lib-suffix): $(o-files) @echo "=====base=============optimized==$(MT)== Linking library: $(@F)" - @$(AR) ru $@ $(o-files) + @$(AR) ru $@ $(o-files) $(extra-o-files) @$(RANLIB) $@ $(LIBDIR)/libbase.g$(static-lib-suffix): $(go-files) @echo "=====base=============debug======$(MT)== Linking library: $(@F)" - @$(AR) ru $@ $(go-files) + @$(AR) ru $@ $(go-files) $(extra-o-files) @$(RANLIB) $@ $(LIBDIR)/libbase$(shared-lib-suffix): $(o-files) @echo "=====base=============optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files) $(extra-o-files) $(LIBDIR)/libbase.g$(shared-lib-suffix): $(go-files) @echo "=====base=============debug======$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files) $(extra-o-files)