]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Move object files into global /lib.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Feb 2002 11:43:02 +0000 (11:43 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Feb 2002 11:43:02 +0000 (11:43 +0000)
git-svn-id: https://svn.dealii.org/trunk@5496 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/hsl/Makefile
deal.II/contrib/hsl/lib/.cvsignore [deleted file]
deal.II/contrib/hsl/lib/o/.cvsignore [deleted file]

index 8724740b7d67b10476244f34b06377927632df53..2b0ac4d96168216129a5fd48333b192d05e2bb6d 100644 (file)
@@ -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 (file)
index d146282..0000000
+++ /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 (file)
index 5761abc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-*.o

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.