From 0b6447557e77c3d9f9f2c2e1cc353bb61f5b8d2e Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 15 Apr 2011 07:09:49 +0000 Subject: [PATCH] psblas3: Makefile fixes --- base/comm/Makefile | 4 +--- base/internals/Makefile | 5 +---- base/psblas/Makefile | 4 +--- base/serial/Makefile | 4 +--- base/serial/aux/Makefile | 4 +--- base/serial/f77/Makefile | 4 +--- base/serial/impl/Makefile | 4 +--- base/tools/Makefile | 4 +--- 8 files changed, 8 insertions(+), 25 deletions(-) diff --git a/base/comm/Makefile b/base/comm/Makefile index 95edf220..75a193fd 100644 --- a/base/comm/Makefile +++ b/base/comm/Makefile @@ -13,9 +13,7 @@ LIBDIR=.. MODDIR=../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). -lib: mpfobjs $(OBJS) $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(MPFOBJS) $(OBJS) +lib: mpfobjs $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/internals/Makefile b/base/internals/Makefile index 5f1d5dc7..94cb660f 100644 --- a/base/internals/Makefile +++ b/base/internals/Makefile @@ -22,10 +22,7 @@ MODDIR=../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). CINCLUDES=-I. -lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(LIBDIR)/$(LIBNAME) - - -$(LIBDIR)/$(LIBNAME): $(MPFOBJS) $(MPFOBJS2) $(FOBJS) $(FOBJS2) +lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(MPFOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(MPFOBJS2) $(FOBJS) $(FOBJS2) $(COBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/psblas/Makefile b/base/psblas/Makefile index a6c419ca..fbb06a8b 100644 --- a/base/psblas/Makefile +++ b/base/psblas/Makefile @@ -17,9 +17,7 @@ MODDIR=../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). -lib: $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(OBJS) +lib: $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/serial/Makefile b/base/serial/Makefile index 2fa7224c..c969ea10 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -12,9 +12,7 @@ LIBDIR=.. MODDIR=../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). -lib: auxd f77d impld lib1 $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(FOBJS) +lib: auxd f77d impld lib1 $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(FOBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/serial/aux/Makefile b/base/serial/aux/Makefile index c8880a9e..e3bf0bf8 100644 --- a/base/serial/aux/Makefile +++ b/base/serial/aux/Makefile @@ -31,9 +31,7 @@ FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(SPARKERDIR) $(FMFLAG default: lib -lib: $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(OBJS) +lib: $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/serial/f77/Makefile b/base/serial/f77/Makefile index 03af4990..77070be8 100644 --- a/base/serial/f77/Makefile +++ b/base/serial/f77/Makefile @@ -27,9 +27,7 @@ LIBFILE=$(LIBDIR)/$(LIBNAME) default: lib -lib: $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(OBJS) +lib: $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/serial/impl/Makefile b/base/serial/impl/Makefile index cde0dfbc..9e1e2260 100644 --- a/base/serial/impl/Makefile +++ b/base/serial/impl/Makefile @@ -28,9 +28,7 @@ LIBFILE=$(LIBDIR)/$(LIBNAME) default: lib -lib: $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(OBJS) +lib: $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) diff --git a/base/tools/Makefile b/base/tools/Makefile index 298fc67f..4befdd40 100644 --- a/base/tools/Makefile +++ b/base/tools/Makefile @@ -27,9 +27,7 @@ LIBDIR=.. MODDIR=../modules FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). $(FIFLAG)$(MODDIR) -lib: mpfobjs $(FOBJS) $(LIBDIR)/$(LIBNAME) - -$(LIBDIR)/$(LIBNAME): $(MPFOBJS) $(FOBJS) +lib: mpfobjs $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(FOBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME)