From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 11 Feb 2002 11:43:02 +0000 (+0000)
Subject: Move object files into global /lib.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec085467927dc61bdaee017ffc7bb943d0cb3c7a;p=dealii-svn.git

Move object files into global /lib.


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

diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile
index 8724740b7d..2b0ac4d961 100644
--- a/deal.II/contrib/hsl/Makefile
+++ b/deal.II/contrib/hsl/Makefile
@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (C) 2001 by Wolfgang Bangerth
+# Copyright (C) 2001, 2002 by Wolfgang Bangerth
 
 
 D = ../..
@@ -16,11 +16,11 @@ endif
 
 # get lists of files we need
 f-files     = $(shell a="`echo source/*.f`"; if test "$$a" != "source/*.f" ; then echo $$a ; fi)
-o-files     = $(f-files:source/%.f=lib/o/%.o)
+o-files     = $(f-files:source/%.f=$(LIBDIR)/contrib/hsl/%.o)
 
 
 
-lib/o/%.o :
+$(LIBDIR)/contrib/hsl/%.o :
 	@echo =====hsl==============optimized==$(MT)== $(<F)
 	@$(F77) $(F77FLAGS.o) -c $< -o $@
 
@@ -56,18 +56,18 @@ clean:
 #of this file.
 #
 #note that we take care if there are no f-files
-lib/Makefile.dep: $(f-files) Makefile
+Makefile.dep: $(f-files) Makefile
 	@echo ============================ Remaking Makefile
-	@(if test "x$(f-files)" != "x" ; then \
+	(if test "x$(f-files)" != "x" ; then \
            for i in source/*.f ; do \
-	     echo $$i | perl -pi -e 's#source/(.*)\.f#lib/o/\1.o:source/\1.f#;' ;\
+	     echo $$i | perl -pi -e 's#source/(.*)\.f#\$$(LIBDIR)/contrib/hsl/\1.o:source/\1.f#;' ;\
 	    done ; \
           fi) \
-		> lib/Makefile.dep
+		> Makefile.dep
 
 
 # include all the dependencies
-include lib/Makefile.dep
+include Makefile.dep
 
 
 .PHONY: clean
diff --git a/deal.II/contrib/hsl/lib/.cvsignore b/deal.II/contrib/hsl/lib/.cvsignore
deleted file mode 100644
index d14628289f..0000000000
--- a/deal.II/contrib/hsl/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-lib*
-Makefile.dep
diff --git a/deal.II/contrib/hsl/lib/o/.cvsignore b/deal.II/contrib/hsl/lib/o/.cvsignore
deleted file mode 100644
index 5761abcfdf..0000000000
--- a/deal.II/contrib/hsl/lib/o/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.o