Bring this file up-to-date.

git-svn-id: https://svn.dealii.org/trunk@2319 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/fe/Makefile b/tests/fe/Makefile
index 1b07386594bcdf4e3480739cf0eea75a9fb8ba83..054cb1a9e4d0aa1dfdd77ad61d09e5403eeef896 100644 (file)
--- a/tests/fe/Makefile
+++ b/tests/fe/Makefile
@@ -23,8 +23,12 @@ debug-mode = on
 # Define library names
 ############################################################
 
-libs   = -ldeal_II_2d -llac -lbase
-libs.g = -ldeal_II_2d.g -llac.g -lbase.g
+libs.g   = $(lib-deal2-2d.g) \
+           $(lib-lac.g)      \
+           $(lib-base.g)
+libs     = $(lib-deal2-2d.o) \
+           $(lib-lac.o)      \
+           $(lib-base.o)
 
 
 ############################################################
@@ -41,6 +45,14 @@ libraries = $(libs)
 flags     = $(CXXFLAGS.o) $(CXXFLAGS)
 endif
 
+# If in multithread mode, add the ACE library to the libraries which
+# we need to link with:
+ifneq ($(with-multithreading),no)
+  libraries += $(lib-ACE)
+endif
+
+
+
 %.go : %.cc Makefile
        @echo =====debug========= $<
        @$(CXX) $(flags) -c $< -o $@