From 90867a3ce8216701cd6eada81bedc13b059a4a2a Mon Sep 17 00:00:00 2001 From: Douglas Guptill <douglas.guptill@dal.ca> Date: Mon, 13 Jul 2009 15:18:57 +0000 Subject: [PATCH] remove the pgplot and X11 libraries --- Makefile.mahone | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile.mahone b/Makefile.mahone index 82760f4a..ba7696c7 100644 --- a/Makefile.mahone +++ b/Makefile.mahone @@ -9,6 +9,21 @@ CC = mpicc # F77 = /usr/local/mpich.pgi.64/bin/mpif77 # CC = /usr/local/mpich.pgi.64/bin/mpicc +# Libraries................ +# +# PGPLOT=/home/dguptill/software/pgplot-5.2.2 +# -L$(PGPLOT) -lpgplot \ +# -L/usr/X11R6/lib64 -lX11 \ + +LIBS = \ + -LOCTREE -lOctree$(BITS) \ + -LNN -lnn_f$(BITS) \ + -LNN -lnn_c$(BITS) \ + -LCASCADE -lcascade$(BITS) \ + -LRESAMPLE -lresample$(BITS) \ + $(WSMP_LIB) \ + -lpthread -lacml + # The Makefiles look at compile output with this PAGER=less @@ -20,7 +35,6 @@ WSMP_DIR = /home/dguptill/software/wsmp/wsmp-Linux/lib/X86_64/PGI # AR=ar OPTIONS= -PGPLOT=/home/dguptill/software/pgplot-5.2.2 WSMP_LIB=-L$(WSMP_DIR) -lpwsmp64 # Define FORTRAN compiler flags....................... @@ -75,17 +89,3 @@ COMPILE_OUT=$(NAME).compile $(CC) $(CFLAGS) -c $< >>$(COMPILE_OUT) 2>&1 -# Libraries................ -# - -LIBS = \ - -lpthread -lacml \ - -LOCTREE -lOctree$(BITS) \ - -LNN -lnn_f$(BITS) \ - -LNN -lnn_c$(BITS) \ - -LCASCADE -lcascade$(BITS) \ - -LRESAMPLE -lresample$(BITS) \ - -L$(PGPLOT) -lpgplot \ - -L/usr/X11R6/lib64 -lX11 \ - $(WSMP_LIB) - -- GitLab