From 0486252110d62a17fcfd3a6d3c7114c9b5e47e75 Mon Sep 17 00:00:00 2001 From: Salvatore Rappoccio Date: Wed, 23 Mar 2016 22:22:20 -0400 Subject: [PATCH] Removing LD_LIBRARY_PATH and INCLUDEPATH in favor of CPT_PATH --- Lecture13/Makefile | 2 +- Lecture14/Makefile | 2 +- Lecture15/Makefile | 2 +- Lecture17/Makefile | 2 +- Lecture18/Makefile | 2 +- Lecture20/Makefile | 2 +- Lecture21/Makefile | 2 +- Lecture22/Makefile | 2 +- Lecture24/Makefile | 2 +- Lecture25/Makefile | 2 +- Lecture26/Makefile | 2 +- Lecture27/Makefile | 2 +- Lecture28/Makefile | 2 +- Lecture29/Makefile | 2 +- Lecture30/Makefile | 2 +- Lecture31/Makefile | 2 +- Lecture32/Makefile | 2 +- setup.csh | 3 +-- setup.sh | 3 +-- 19 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Lecture13/Makefile b/Lecture13/Makefile index c042ddc..82f19c4 100644 --- a/Lecture13/Makefile +++ b/Lecture13/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: scattering wheatstone diff --git a/Lecture14/Makefile b/Lecture14/Makefile index 7faf7fe..fe8f6c7 100644 --- a/Lecture14/Makefile +++ b/Lecture14/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: co2_polyfit bvp_example diff --git a/Lecture15/Makefile b/Lecture15/Makefile index c575ec8..c40f36f 100644 --- a/Lecture15/Makefile +++ b/Lecture15/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: triatomic matrixmult diff --git a/Lecture17/Makefile b/Lecture17/Makefile index 966a9de..af76ef4 100644 --- a/Lecture17/Makefile +++ b/Lecture17/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: higgs minimize diff --git a/Lecture18/Makefile b/Lecture18/Makefile index 4d1cea0..848003f 100644 --- a/Lecture18/Makefile +++ b/Lecture18/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: na2cl2 diff --git a/Lecture20/Makefile b/Lecture20/Makefile index dd9cd61..a640486 100644 --- a/Lecture20/Makefile +++ b/Lecture20/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: balle pendul diff --git a/Lecture21/Makefile b/Lecture21/Makefile index 21e182e..c22babd 100644 --- a/Lecture21/Makefile +++ b/Lecture21/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: pendul_nonlin diff --git a/Lecture22/Makefile b/Lecture22/Makefile index 7dfaecb..994e6e5 100644 --- a/Lecture22/Makefile +++ b/Lecture22/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: rcp3body planar3body kepler diff --git a/Lecture24/Makefile b/Lecture24/Makefile index 9cb3e56..baae7aa 100644 --- a/Lecture24/Makefile +++ b/Lecture24/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: shoot relax infwell diff --git a/Lecture25/Makefile b/Lecture25/Makefile index 0fec849..f250644 100644 --- a/Lecture25/Makefile +++ b/Lecture25/Makefile @@ -4,7 +4,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. CFLAGS=-c -Wall -LDFLAGS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LDFLAGS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: kronig_penney schroedinger diff --git a/Lecture26/Makefile b/Lecture26/Makefile index 52a4ce2..c69c0ef 100644 --- a/Lecture26/Makefile +++ b/Lecture26/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: poisson_fft poisson diff --git a/Lecture27/Makefile b/Lecture27/Makefile index 373bb75..a5c6a0a 100644 --- a/Lecture27/Makefile +++ b/Lecture27/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: poisson_mg diff --git a/Lecture28/Makefile b/Lecture28/Makefile index 8554688..c4a1b12 100644 --- a/Lecture28/Makefile +++ b/Lecture28/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: wavepacket_fft diff --git a/Lecture29/Makefile b/Lecture29/Makefile index 0e0bf20..f3661fa 100644 --- a/Lecture29/Makefile +++ b/Lecture29/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: advection burgers diff --git a/Lecture30/Makefile b/Lecture30/Makefile index c4432ab..04286ee 100644 --- a/Lecture30/Makefile +++ b/Lecture30/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: random_test quad rwalk diff --git a/Lecture31/Makefile b/Lecture31/Makefile index 9eb005d..deffe19 100644 --- a/Lecture31/Makefile +++ b/Lecture31/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: metropolis disks diff --git a/Lecture32/Makefile b/Lecture32/Makefile index 3c85d2d..18aee51 100644 --- a/Lecture32/Makefile +++ b/Lecture32/Makefile @@ -3,7 +3,7 @@ CC=g++ # Hey!, I am comment number 2. I want to say that CFLAGS will be the # options I'll pass to the compiler. -LIBS=-I$(INCLUDEPATH) -L$(LD_LIBRARY_PATH) -lcpt +LIBS=-I$(CPT_PATH) -L$(CPT_PATH) -lcpt all: ising diff --git a/setup.csh b/setup.csh index 3731510..ce84a0b 100644 --- a/setup.csh +++ b/setup.csh @@ -1,6 +1,5 @@ #!/usr/bin/env tcsh -setenv LD_LIBRARY_PATH $PWD/cpt -setenv INCLUDEPATH $PWD/cpt +setenv CPT_PATH $PWD/cpt setenv PYTHONPATH $PWD/cpt_python setenv PATH $PWD/cpt:$PATH diff --git a/setup.sh b/setup.sh index af54d3c..f7c674d 100644 --- a/setup.sh +++ b/setup.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -export LD_LIBRARY_PATH=$PWD/cpt -export INCLUDEPATH=$PWD/cpt +export CPT_PATH=$PWD/cpt export PYTHONPATH=$PWD/cpt_python export PATH=$PWD/cpt:$PATH