Removing LD_LIBRARY_PATH and INCLUDEPATH in favor of CPT_PATH

rappoccio · Mar 24, 2016 · 0486252 · 0486252
1 parent 1aaaa90
commit 0486252
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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