Moved make variable logic to Makefile.defs, now callable from problem

makefiles
emilyng · Jul 28, 2015 · 4727a6a · 4727a6a
1 parent e2baddb
commit 4727a6a
Show file tree

Hide file tree

Showing 32 changed files with 117 additions and 116 deletions.
diff --git a/examples/J2/Makefile b/examples/J2/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/bouncing_balls/Makefile b/examples/bouncing_balls/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/bouncing_balls_corners/Makefile b/examples/bouncing_balls_corners/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/bouncing_string/Makefile b/examples/bouncing_string/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/circumplanetarydust/Makefile b/examples/circumplanetarydust/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/closeencounter/Makefile b/examples/closeencounter/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/closeencounter_hybrid/Makefile b/examples/closeencounter_hybrid/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/closeencounter_record/Makefile b/examples/closeencounter_record/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/dragforce/Makefile b/examples/dragforce/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/eccentric_orbit/Makefile b/examples/eccentric_orbit/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/granulardynamics/Makefile b/examples/granulardynamics/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/kozai/Makefile b/examples/kozai/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/megno/Makefile b/examples/megno/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/mergers/Makefile b/examples/mergers/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/outer_solar_system/Makefile b/examples/outer_solar_system/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/overstability/Makefile b/examples/overstability/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/particles_ids_and_removal/Makefile b/examples/particles_ids_and_removal/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/planetary_migration/Makefile b/examples/planetary_migration/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/prdrag/Makefile b/examples/prdrag/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/profiling/Makefile b/examples/profiling/Makefile
@@ -1,11 +1,11 @@
 export OPENGL=1
 export PROFILING=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/restarting_simulation/Makefile b/examples/restarting_simulation/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/restricted_threebody/Makefile b/examples/restricted_threebody/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/selfgravity_disc/Makefile b/examples/selfgravity_disc/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/selfgravity_plummer/Makefile b/examples/selfgravity_plummer/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/shearing_sheet/Makefile b/examples/shearing_sheet/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/shearing_sheet_2/Makefile b/examples/shearing_sheet_2/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/simplest/Makefile b/examples/simplest/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/solar_system/Makefile b/examples/solar_system/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/spreading_ring/Makefile b/examples/spreading_ring/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."
 

diff --git a/examples/star_of_david/Makefile b/examples/star_of_david/Makefile
@@ -1,10 +1,10 @@
 export OPENGL=1
-OPT+= -std=c99 -Wpointer-arith -D_GNU_SOURCE -O3 -march=native
+include ../../src/Makefile.defs
 
 all: librebound
 	@echo ""
 	@echo "Compiling problem file ..."
-	cc -I../../src/ -L. -Wl,-rpath,./ $(OPT) problem.c -lrebound -lm -o rebound
+	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
 	@echo ""
 	@echo "REBOUND compiled successfully."