From 4d9cb2295d40ebf3bf5e5e3004eaf3b4e342afbd Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 10 Nov 2013 18:12:49 +0000 Subject: [PATCH] Makefile changes --- Make.inc.in | 1 + Makefile | 3 +++ base/Makefile | 3 ++- base/comm/Makefile | 3 ++- base/internals/Makefile | 3 ++- base/psblas/Makefile | 3 ++- base/serial/Makefile | 3 ++- base/serial/aux/Makefile | 3 ++- base/serial/f77/Makefile | 3 ++- base/serial/impl/Makefile | 3 ++- base/tools/Makefile | 3 ++- configure | 10 ++++++++-- configure.ac | 7 ++++++- krylov/Makefile | 7 ++++--- prec/Makefile | 7 ++++--- prec/impl/Makefile | 3 ++- test/fileread/Makefile | 8 +++++--- test/kernel/Makefile | 14 ++++++-------- test/pargen/Makefile | 11 ++++++----- test/pargen/runs/Makefile | 12 ------------ test/pargen/runs/mach | 8 -------- test/util/Makefile | 14 ++++++-------- util/Makefile | 7 ++++--- 23 files changed, 73 insertions(+), 66 deletions(-) delete mode 100644 test/pargen/runs/Makefile delete mode 100644 test/pargen/runs/mach diff --git a/Make.inc.in b/Make.inc.in index bcb496e1..5ff454bf 100755 --- a/Make.inc.in +++ b/Make.inc.in @@ -49,6 +49,7 @@ INSTALL_DIR=@INSTALL_DIR@ INSTALL_LIBDIR=@INSTALL_LIBDIR@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@ INSTALL_DOCSDIR=@INSTALL_DOCSDIR@ +INSTALL_SAMPLESDIR=@INSTALL_SAMPLESDIR@ # the following is the flag for /bin/cp which shall copy the file only for updating (timestamp based)--on GNU Linux, '-u' CPUPDFLAG= diff --git a/Makefile b/Makefile index 477daaac..1f08b4ab 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ kryld: precd based libd: (if test ! -d lib ; then mkdir lib; fi) + (if test ! -d include ; then mkdir include; $(INSTALL_DATA) Make.inc include/Make.inc.psblas; fi) based: cd base && $(MAKE) lib precd: @@ -41,6 +42,8 @@ check: all cleanlib: (cd lib; /bin/rm -f *.a *$(.mod) *$(.fh)) + (cd include; /bin/rm -f *.a *$(.mod) *$(.fh)) + veryclean: cleanlib cd base && $(MAKE) veryclean cd prec && $(MAKE) veryclean diff --git a/base/Makefile b/base/Makefile index e40788d8..96bfb8fd 100644 --- a/base/Makefile +++ b/base/Makefile @@ -2,11 +2,12 @@ include ../Make.inc HERE=. LIBDIR=../lib +INCDIR=../include LIBNAME=$(BASELIBNAME) lib: mods sr cm in pb tl /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) sr cm in pb tl: mods diff --git a/base/comm/Makefile b/base/comm/Makefile index 598ab0c2..bbe769c5 100644 --- a/base/comm/Makefile +++ b/base/comm/Makefile @@ -10,8 +10,9 @@ OBJS = psb_dgather.o psb_dhalo.o psb_dovrl.o \ MPFOBJS=psb_dscatter.o psb_zscatter.o psb_iscatter.o psb_cscatter.o psb_sscatter.o\ psb_dspgather.o psb_sspgather.o psb_zspgather.o psb_cspgather.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: mpfobjs $(OBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(OBJS) diff --git a/base/internals/Makefile b/base/internals/Makefile index 2d3729bc..b1bf314c 100644 --- a/base/internals/Makefile +++ b/base/internals/Makefile @@ -18,8 +18,9 @@ MPFOBJS = psi_dswapdata.o psi_dswaptran.o\ psi_desc_index.o psi_extrct_dl.o \ psi_fnd_owner.o psb_indx_map_fnd_owner.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) CINCLUDES=-I. lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(MPFOBJS) diff --git a/base/psblas/Makefile b/base/psblas/Makefile index e1bfd789..44eb67ee 100644 --- a/base/psblas/Makefile +++ b/base/psblas/Makefile @@ -13,8 +13,9 @@ OBJS= psb_ddot.o psb_damax.o psb_dasum.o psb_daxpby.o\ LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: $(OBJS) diff --git a/base/serial/Makefile b/base/serial/Makefile index 764d481c..e8572326 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -12,8 +12,9 @@ FOBJS = psb_lsame.o psi_serial_impl.o psb_sort_impl.o \ psb_sasum_s.o psb_dasum_s.o psb_casum_s.o psb_zasum_s.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) lib: auxd f77d impld lib1 $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(FOBJS) diff --git a/base/serial/aux/Makefile b/base/serial/aux/Makefile index 134a5782..6fd99b3f 100644 --- a/base/serial/aux/Makefile +++ b/base/serial/aux/Makefile @@ -22,8 +22,9 @@ OBJS=$(FOBJS) # Note that we are regenerating most of libsparker.a on the fly. SPARKERDIR=.. LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) # # No change should be needed below diff --git a/base/serial/f77/Makefile b/base/serial/f77/Makefile index a8ae7e70..29ff6300 100644 --- a/base/serial/f77/Makefile +++ b/base/serial/f77/Makefile @@ -14,8 +14,9 @@ OBJS=$(FOBJS) # Note that we are regenerating most of libsparker.a on the fly. SPARKERDIR=.. LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) #LIBNAME=libsparker.a #LIBNAME=$(BASELIBNAME) LIBFILE=$(LIBDIR)/$(LIBNAME) diff --git a/base/serial/impl/Makefile b/base/serial/impl/Makefile index c8513fcb..6a38d6b9 100644 --- a/base/serial/impl/Makefile +++ b/base/serial/impl/Makefile @@ -16,8 +16,9 @@ OBJS=$(BOBJS) $(SOBJS) $(DOBJS) $(COBJS) $(ZOBJS) # Note that we are regenerating most of libsparker.a on the fly. SPARKERDIR=.. LIBDIR=../.. +INCDIR=../.. MODDIR=../../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) #LIBNAME=libsparker.a LIBFILE=$(LIBDIR)/$(LIBNAME) diff --git a/base/tools/Makefile b/base/tools/Makefile index f9d03099..e5e86f3d 100644 --- a/base/tools/Makefile +++ b/base/tools/Makefile @@ -25,8 +25,9 @@ MPFOBJS = psb_icdasb.o psb_ssphalo.o psb_dsphalo.o psb_csphalo.o psb_zsphalo.o psb_dcdbldext.o psb_zcdbldext.o psb_scdbldext.o psb_ccdbldext.o LIBDIR=.. +INCDIR=.. MODDIR=../modules -FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) $(FIFLAG)$(MODDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(FIFLAG)$(MODDIR) lib: mpfobjs $(FOBJS) $(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(FOBJS) diff --git a/configure b/configure index 3d718307..46369848 100755 --- a/configure +++ b/configure @@ -651,6 +651,7 @@ FINCLUDES CINCLUDES METIS_LIBS AMD_LIBS +INSTALL_SAMPLESDIR INSTALL_DOCSDIR INSTALL_INCLUDEDIR INSTALL_LIBDIR @@ -2134,8 +2135,12 @@ case $docsdir in \/* ) eval "INSTALL_DOCSDIR=$docsdir";; * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; esac -{ $as_echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&5 -$as_echo "$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&6; } +case $samplesdir in + \/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";; + * ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";; +esac +{ $as_echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR" >&5 +$as_echo "$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR" >&6; } # Note that the following line won't save from troubles. ac_ext=${ac_fc_srcext-f} @@ -10305,6 +10310,7 @@ UTILLIBNAME=libpsb_util.a + PSBLASRULES=' diff --git a/configure.ac b/configure.ac index f2816d83..b54d6f1a 100755 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,11 @@ case $docsdir in \/* ) eval "INSTALL_DOCSDIR=$docsdir";; * ) eval "INSTALL_DOCSDIR=$INSTALL_DIR/docs";; esac -AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR]) +case $samplesdir in + \/* ) eval "INSTALL_SAMPLESDIR=$samplesdir";; + * ) eval "INSTALL_SAMPLESDIR=$INSTALL_DIR/samples";; +esac +AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR $INSTALL_SAMPLESDIR]) # Note that the following line won't save from troubles. AC_PROG_FC([ftn xlf2003_r xlf2003 xlf95_r xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran]) @@ -777,6 +781,7 @@ AC_SUBST(INSTALL_DIR) AC_SUBST(INSTALL_LIBDIR) AC_SUBST(INSTALL_INCLUDEDIR) AC_SUBST(INSTALL_DOCSDIR) +AC_SUBST(INSTALL_SAMPLESDIR) AC_SUBST(BLAS_LIBS) AC_SUBST(AMD_LIBS) diff --git a/krylov/Makefile b/krylov/Makefile index e93f4ed9..7b68aad2 100644 --- a/krylov/Makefile +++ b/krylov/Makefile @@ -3,6 +3,7 @@ include ../Make.inc HERE=. LIBDIR=../lib +INCDIR=../include #MODOBJS= psb_base_inner_krylov_mod.o \ # psb_s_inner_krylov_mod.o psb_c_inner_krylov_mod.o psb_d_inner_krylov_mod.o psb_z_inner_krylov_mod.o \ @@ -24,19 +25,19 @@ OBJS=$(F90OBJS) $(MODOBJS) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LIBNAME=$(METHDLIBNAME) -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) lib: $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o: psb_base_krylov_conv_mod.o psb_krylov_conv_mod.o: psb_s_krylov_conv_mod.o psb_c_krylov_conv_mod.o psb_d_krylov_conv_mod.o psb_z_krylov_conv_mod.o $(F90OBJS): $(MODOBJS) -$(OBJS): $(LIBDIR)/$(PRECMODNAME)$(.mod) $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(PRECMODNAME)$(.mod) $(INCDIR)/$(BASEMODNAME)$(.mod) veryclean: clean /bin/rm -f $(HERE)/$(LIBNAME) diff --git a/prec/Makefile b/prec/Makefile index ac92049a..2538f522 100644 --- a/prec/Makefile +++ b/prec/Makefile @@ -1,6 +1,7 @@ include ../Make.inc LIBDIR=../lib +INCDIR=../include HERE=. MODOBJS=psb_prec_const_mod.o\ psb_s_prec_type.o psb_d_prec_type.o psb_c_prec_type.o psb_z_prec_type.o \ @@ -15,19 +16,19 @@ MODOBJS=psb_prec_const_mod.o\ LIBNAME=$(PRECLIBNAME) COBJS= -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) OBJS=$(F90OBJS) $(COBJS) $(MPFOBJS) $(MODOBJS) lib: $(OBJS) impld $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) impld: $(OBJS) cd impl && $(MAKE) -$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(BASEMODNAME)$(.mod) psb_s_base_prec_mod.o psb_d_base_prec_mod.o psb_c_base_prec_mod.o psb_z_base_prec_mod.o: psb_prec_const_mod.o diff --git a/prec/impl/Makefile b/prec/impl/Makefile index 4e566fa6..90b51fbb 100644 --- a/prec/impl/Makefile +++ b/prec/impl/Makefile @@ -1,6 +1,7 @@ include ../../Make.inc LIBDIR=../../lib +INCDIR=../../include HERE=.. OBJS=psb_s_prec_type_impl.o psb_d_prec_type_impl.o \ psb_c_prec_type_impl.o psb_z_prec_type_impl.o \ @@ -19,7 +20,7 @@ OBJS=psb_s_prec_type_impl.o psb_d_prec_type_impl.o \ LIBNAME=$(PRECLIBNAME) COBJS= -FINCLUDES=$(FMFLAG).. $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG).. $(FMFLAG)$(INCDIR) lib: $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) diff --git a/test/fileread/Makefile b/test/fileread/Makefile index 9987ac49..5cf3f646 100644 --- a/test/fileread/Makefile +++ b/test/fileread/Makefile @@ -1,12 +1,14 @@ -include ../../Make.inc # # Libraries used # -LIBDIR=../../lib/ +BASEDIR=../.. +LIBDIR=$(BASEDIR)/lib/ +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). SFOBJS=getp.o sf_sample.o DFOBJS=getp.o df_sample.o diff --git a/test/kernel/Makefile b/test/kernel/Makefile index 50b27000..b72e97c0 100644 --- a/test/kernel/Makefile +++ b/test/kernel/Makefile @@ -1,14 +1,16 @@ -include ../../Make.inc # # Libraries used # -LIBDIR=../../lib/ +BASEDIR=../.. +LIBDIR=$(BASEDIR)/lib/ +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas2 PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). + -DBOBJS=dpsbench.o DTOBJS=d_file_spmv.o STOBJS=s_file_spmv.o DPGOBJS=pdgenspmv.o @@ -17,10 +19,6 @@ EXEDIR=./runs all: d_file_spmv s_file_spmv pdgenspmv -dpsbench: $(DBOBJS) - $(F90LINK) $(LOPT) $(DBOBJS) -o dpsbench $(PSBLAS_LIB) $(LDLIBS) - /bin/mv dpsbench $(EXEDIR) - d_file_spmv: $(DTOBJS) $(F90LINK) $(LOPT) $(DTOBJS) -o d_file_spmv $(PSBLAS_LIB) $(LDLIBS) /bin/mv d_file_spmv $(EXEDIR) diff --git a/test/pargen/Makefile b/test/pargen/Makefile index 8e670ac7..5a530afa 100644 --- a/test/pargen/Makefile +++ b/test/pargen/Makefile @@ -1,15 +1,16 @@ -include ../../Make.inc # # Libraries used -# -LIBDIR=../../lib/ +BASEDIR=../.. +LIBDIR=$(BASEDIR)/lib +INCDIR=$(BASEDIR)/include +include $(INCDIR)/Make.inc.psblas PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) # # Compilers and such # CCOPT= -g -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). EXEDIR=./runs @@ -37,7 +38,7 @@ spde2d: spde2d.o clean: - /bin/rm -f ppde3d.o spde3d.o ppde2d.o spde2d.o \ + /bin/rm -f ppde3d.o spde3d.o ppde2d.o spde2d.o *$(.mod) \ $(EXEDIR)/ppde3d $(EXEDIR)/spde3d $(EXEDIR)/ppde2d $(EXEDIR)/spde2d verycleanlib: (cd ../..; make veryclean) diff --git a/test/pargen/runs/Makefile b/test/pargen/runs/Makefile deleted file mode 100644 index d8fa43ac..00000000 --- a/test/pargen/runs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -lib: - (cd ..; $(MAKE) lib) -clean: - (cd ..; $(MAKE) clean) -verycleanlib: - (cd ..; $(MAKE) verycleanlib) -ppde90: - (cd ..; $(MAKE) ppde90) -pp2d: - (cd ..; $(MAKE) pp2d) - -.PHONY: pp2d ppde90 diff --git a/test/pargen/runs/mach b/test/pargen/runs/mach deleted file mode 100644 index 60432829..00000000 --- a/test/pargen/runs/mach +++ /dev/null @@ -1,8 +0,0 @@ -localhost -localhost -localhost -localhost -localhost -localhost -localhost -localhost diff --git a/test/util/Makefile b/test/util/Makefile index b17ac9e1..8bbe05ca 100644 --- a/test/util/Makefile +++ b/test/util/Makefile @@ -1,16 +1,14 @@ -include ../../Make.inc # # Libraries used # -LIBDIR=../../lib/ -PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base +BASEDIR=../.. +LIBDIR=$(BASEDIR)/lib/ +INCDIR=$(BASEDIR)/include/ +include $(INCDIR)/Make.inc.psblas +PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base LDLIBS=$(PSBLDLIBS) -# -# We are using the public domain tool METIS from U. Minnesota. To get it -# check URL http://www.cs.umn.edu:~karypis -# -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). +FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG). ZH2MOBJS=zhb2mm.o DH2MOBJS=dhb2mm.o diff --git a/util/Makefile b/util/Makefile index f5405ef1..e0b11f66 100644 --- a/util/Makefile +++ b/util/Makefile @@ -2,6 +2,7 @@ include ../Make.inc LIBDIR=../lib +INCDIR=../include HERE=. @@ -22,18 +23,18 @@ COBJS=psb_amd_order.o OBJS=$(MODOBJS) $(IMPLOBJS) $(COBJS) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) LIBNAME=$(UTILLIBNAME) -FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) +FINCLUDES=$(FMFLAG). $(FMFLAG)$(INCDIR) lib: $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) + /bin/cp -p $(CPUPDFLAG) *$(.mod) $(INCDIR) $(HERE)/$(LIBNAME): $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) -$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod) +$(OBJS): $(INCDIR)/$(BASEMODNAME)$(.mod) psb_util_mod.o: $(BASEOBJS) $(IMPLOBJS): $(BASEOBJS)