]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix recent compile issues.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Jun 2006 16:04:41 +0000 (16:04 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 21 Jun 2006 16:04:41 +0000 (16:04 +0000)
git-svn-id: https://svn.dealii.org/trunk@13291 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/hsl/Makefile

index bb1959fc10684d1026394da3847c543c74e61286..e0a7f39786b90e74b95fc8e2f72481af62111f2d 100644 (file)
@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2001, 2002, 2003, 2004 by Wolfgang Bangerth
+# Copyright (C) 2001, 2002, 2003, 2004, 2006 by Wolfgang Bangerth
 
 
 D = ../..
@@ -20,13 +20,21 @@ o-files     = $(f-files:source/%.f=$(LIBDIR)/contrib/hsl/%.$(OBJEXT))
 
 
 
+
+# rules
+lib: $(LIBDIR)/libhsl$(lib-suffix) $(LIBDIR)/bin/detached_ma27$(EXEEXT)
+
+
+
 $(LIBDIR)/contrib/hsl/%.$(OBJEXT) :
        @echo =====hsl==============optimized==$(MT)== $(<F)
        @$(F77) $(F77FLAGS.o) -c $< -o $@
 
 
-# rules
-lib: $(LIBDIR)/libhsl$(lib-suffix) $(LIBDIR)/bin/detached_ma27$(EXEEXT)
+$(LIBDIR)/contrib/hsl/detached_ma27.$(OBJEXT) : source/detached_ma27.cc \
+                                               include/hsl/hsl.h
+       @echo =====hsl==============optimized==$(MT)== $(<F)
+       @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 
 
 $(LIBDIR)/libhsl$(static-lib-suffix): $(forward-declarations) $(o-files)
@@ -45,10 +53,12 @@ $(LIBDIR)/libhsl$(shared-lib-suffix): $(forward-declarations) $(o-files)
 # rule to make the program that runs an MA27 solver detached from the
 # main program, and communicates through a pipe. since this program
 # has actually nothing much to do, compile it in debug mode
-$(LIBDIR)/bin/detached_ma27$(EXEEXT): source/detached_ma27.cc include/hsl/hsl.h \
-                               $(LIBDIR)/libhsl$(lib-suffix)
+$(LIBDIR)/bin/detached_ma27$(EXEEXT):  \
+                               $(LIBDIR)/contrib/hsl/detached_ma27.$(OBJEXT) \
+                                -lhsl \
+                               $(lib-base.o)
        @echo =====hsl=========================$(MT)== Making   $(@F)
-       @$(CXX) $(CXXFLAGS.g) $< -o $@ $(LIBDIR)/libhsl$(lib-suffix) $(lib-base.o) $(F77LIBS) -lpthread $(LIBS)
+       @$(CXX) $(CXXFLAGS.g) $^ -o $@ $(F77LIBS) -lpthread $(LIBS)
 
 
 

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.