From 9be3a40c8801e46f84d6a06e8a2e466b1291f384 Mon Sep 17 00:00:00 2001 From: Michele Martone Date: Tue, 5 Apr 2011 15:01:40 +0000 Subject: [PATCH] psblas3: makefile fixes to the previous commit (some targets were missing): now it seems ok. --- base/Makefile | 6 ++++-- base/serial/f77/Makefile | 1 + prec/Makefile | 2 +- util/Makefile | 5 ++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/base/Makefile b/base/Makefile index 639035b9..f38f3a1c 100644 --- a/base/Makefile +++ b/base/Makefile @@ -4,12 +4,14 @@ HERE=. LIBDIR=../lib LIBNAME=$(BASELIBNAME) LIBMOD=psb_base_mod$(.mod) -lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD) mods sr cm in pb tl +lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD) + +$(HERE)/$(LIBNAME): mods sr cm in pb tl $(LIBDIR)/$(LIBNAME): $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) -$(LIBDIR)/$(LIBMOD): +$(LIBDIR)/$(LIBMOD): $(LIBMOD) /bin/cp -p $(CPUPDFLAG) $(LIBMOD) *$(.mod) $(LIBDIR) sr cm in pb tl: mods diff --git a/base/serial/f77/Makefile b/base/serial/f77/Makefile index 68312db2..354d87a2 100644 --- a/base/serial/f77/Makefile +++ b/base/serial/f77/Makefile @@ -17,6 +17,7 @@ LIBDIR=../.. MODDIR=../../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(SPARKERDIR) $(FMFLAG). #LIBNAME=libsparker.a +LIBNAME=$(BASELIBNAME) LIBFILE=$(LIBDIR)/$(LIBNAME) # diff --git a/prec/Makefile b/prec/Makefile index 72a7c3c3..92142f70 100644 --- a/prec/Makefile +++ b/prec/Makefile @@ -29,7 +29,7 @@ OBJS=$(F90OBJS) $(COBJS) $(MPFOBJS) $(MODOBJS) lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD) -$(HERE)/$(LIBNAME): +$(HERE)/$(LIBNAME): $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) diff --git a/util/Makefile b/util/Makefile index de4f9a15..a5440b30 100644 --- a/util/Makefile +++ b/util/Makefile @@ -21,14 +21,13 @@ lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD) $(LIBDIR)/$(LIBNAME): $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) -$(LIBDIR)/$(LIBMOD): +$(LIBDIR)/$(LIBMOD): $(LIBMOD) /bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LOCAL_MODS) $(LIBDIR) -$(HERE)/$(LIBNAME): +$(HERE)/$(LIBNAME): $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) - psb_util_mod.o: $(BASEOBJS) veryclean: clean