diff --git a/Makefile.p690 b/Makefile.p690 index 1197115cdd35f342ebcbe0f10c53bf90783d7c47..700314124d4faf03b6b797d70fa75df788ce1c0f 100644 --- a/Makefile.p690 +++ b/Makefile.p690 @@ -4,6 +4,24 @@ F90 = mpxlf90_r F77 = mpxlf_r CC = mpcc_r +# Libraries................ +# +# libs removed on p690... +# -lacml +# -L/usr/lpp/X11 -lX11 \ +# PGPLOT = /home/beaumnt1/software/pgplot-5.2.2-q64 +# -L$(PGPLOT) -lpgplot \ + +LIBS = \ + -LOCTREE -lOctree$(BITS) \ + -LNN -lnn_f$(BITS) \ + -LNN -lnn_c$(BITS) \ + -LCASCADE -lcascade$(BITS) \ + $(WSMP_LIB) \ + -LRESAMPLE -lresample$(BITS) \ + -lpthread -lhm -lhu -lm_r + + # The Makefiles look at compile output with this PAGER=more @@ -11,21 +29,11 @@ PAGER=more # WSMP_DIR = /home/beaumnt1/software/wsmp/lib/Power4 -# for 32 bit compile.................................. -# -# AR=ar -# BITS=-q32 -# OPTIONS = -bmaxdata:0x80000000 -bhalt:0 -bnoquiet -# PGPLOT = /home/beaumnt1/software/pgplot-5.2.2 -# WSMP_LIB = -L$(WSMP_DIR) -lpwsmp -# FLG64= - # for 64 bit compile.................................. # AR =ar -X 64 BITS=-q64 OPTIONS = -b64 -bmaxdata:0x80000000 -bhalt:0 -bnoquiet -PGPLOT = /home/beaumnt1/software/pgplot-5.2.2-q64 WSMP_LIB = -L$(WSMP_DIR) -lpwsmp64 FLG64=-b64 @@ -43,7 +51,7 @@ FLG64=-b64 # -qflttrap=overflow:underflow:zerodivide:invalid:enable # for xlf 10.1 # -qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable - +# # take -qextchk out for the final compile # Need -qhalt=s, else the compiler stops on the multiple errors from MPI calls. # For no optimzation, use "-O0" and remove "-qstrict" @@ -101,20 +109,3 @@ COMPILE_OUT=$(NAME)$(BITS).compile $(CC) $(CFLAGS) -c $< >>$(COMPILE_OUT) 2>&1 -# Libraries................ -# -# libs removed on p690... -# -lacml - -LIBS = \ - -LOCTREE -lOctree$(BITS) \ - -LNN -lnn_f$(BITS) \ - -LNN -lnn_c$(BITS) \ - -LCASCADE -lcascade$(BITS) \ - -L$(PGPLOT) -lpgplot \ - -L/usr/lpp/X11 -lX11 \ - $(WSMP_LIB) \ - -LRESAMPLE -lresample$(BITS) \ - -lpthread -lhm -lhu -lm_r - -