]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Link with the function parser object file as well.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 7 Mar 2005 02:50:58 +0000 (02:50 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 7 Mar 2005 02:50:58 +0000 (02:50 +0000)
git-svn-id: https://svn.dealii.org/trunk@10021 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/Makefile

index 81adc642d9c8bc37d087f46b4d9044bf7fece6f7..19c3deca64c4287ec078a63b4e10935a97e12bd7 100644 (file)
@@ -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)
 
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.