rot

examples/removing_particles_from_simulation/Makefile

@@ -1,22 +1,25 @@
-export OPENGL=1
+export OPENGL=0
 include ../../src/Makefile.defs
 
-all: librebound
+# CCPROBLEM is defined in Makefile.defs to allow for
+# a compact cross platform Makefile
+all: problem.c $(LIBREBOUND)
+	@echo "Compiling $< ..."
+	$(CCPROBLEM)
 	@echo ""
-	@echo "Compiling problem file ..."
-	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
+	@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
 	@echo ""
-	@echo "REBOUND compiled successfully."
 
-librebound: 
-	@echo "Compiling shared library librebound.so ..."
+$(LIBREBOUND): 
+	@echo "Compiling shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/
-	@-rm -f librebound.so
-	@ln -s ../../src/librebound.so .
+	@-$(RM) $(LIBREBOUND)
+	@$(LINKORCOPYLIBREBOUND)
+	@echo ""
 
 clean:
-	@echo "Cleaning up shared library librebound.so ..."
-	@-rm -f librebound.so
+	@echo "Cleaning up shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/ clean
 	@echo "Cleaning up local directory ..."
-	@-rm -vf rebound
+	@-$(RM) $(LIBREBOUND)
+	@-$(RM) $(EXEREBOUND)

examples/removing_particles_from_simulation/problem.c

@@ -6,7 +6,6 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <math.h>
 #include "rebound.h"
 

examples/restarting_simulation/Makefile

@@ -1,22 +1,25 @@
 export OPENGL=0
 include ../../src/Makefile.defs
 
-all: librebound
+# CCPROBLEM is defined in Makefile.defs to allow for
+# a compact cross platform Makefile
+all: problem.c $(LIBREBOUND)
+	@echo "Compiling $< ..."
+	$(CCPROBLEM)
 	@echo ""
-	@echo "Compiling problem file ..."
-	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
+	@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
 	@echo ""
-	@echo "REBOUND compiled successfully."
 
-librebound: 
-	@echo "Compiling shared library librebound.so ..."
+$(LIBREBOUND): 
+	@echo "Compiling shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/
-	@-rm -f librebound.so
-	@ln -s ../../src/librebound.so .
+	@-$(RM) $(LIBREBOUND)
+	@$(LINKORCOPYLIBREBOUND)
+	@echo ""
 
 clean:
-	@echo "Cleaning up shared library librebound.so ..."
-	@-rm -f librebound.so
+	@echo "Cleaning up shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/ clean
 	@echo "Cleaning up local directory ..."
-	@-rm -vf rebound
+	@-$(RM) $(LIBREBOUND)
+	@-$(RM) $(EXEREBOUND)

examples/restarting_simulation/problem.c

@@ -7,7 +7,6 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <math.h>
 #include "rebound.h"
 

examples/restricted_threebody/Makefile

@@ -1,40 +1,25 @@
 export OPENGL=1
-
-# OpenMP
-# On Mac OSX, we can use the CLANG compiler. But it requires some additional 
-# flags (see Makefile.defs in src/ directory). You also need to install the 
-# OpenMP library with homebrew:
-#    brew install libomp
-# Alternatively use a compiler which supports OpenMP out of the box (gcc) and
-# uncomment the following line:
-# export CC=gcc
-
-# Ucomment the following lines to turn on OPENMP
-#ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
-#export OPENMPCLANG=1
-#else
-#export OPENMP=1
-#endif
-
-
 include ../../src/Makefile.defs
 
-all: librebound
+# CCPROBLEM is defined in Makefile.defs to allow for
+# a compact cross platform Makefile
+all: problem.c $(LIBREBOUND)
+	@echo "Compiling $< ..."
+	$(CCPROBLEM)
 	@echo ""
-	@echo "Compiling problem file ..."
-	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
+	@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
 	@echo ""
-	@echo "REBOUND compiled successfully."
 
-librebound: 
-	@echo "Compiling shared library librebound.so ..."
+$(LIBREBOUND): 
+	@echo "Compiling shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/
-	@-rm -f librebound.so
-	@ln -s ../../src/librebound.so .
+	@-$(RM) $(LIBREBOUND)
+	@$(LINKORCOPYLIBREBOUND)
+	@echo ""
 
 clean:
-	@echo "Cleaning up shared library librebound.so ..."
-	@-rm -f librebound.so
+	@echo "Cleaning up shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/ clean
 	@echo "Cleaning up local directory ..."
-	@-rm -vf rebound
+	@-$(RM) $(LIBREBOUND)
+	@-$(RM) $(EXEREBOUND)

examples/restricted_threebody/problem.c

@@ -7,7 +7,6 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <math.h>
 #include "rebound.h"
 

examples/rotations/Makefile

@@ -1,22 +1,25 @@
 export OPENGL=0
 include ../../src/Makefile.defs
 
-all: librebound
+# CCPROBLEM is defined in Makefile.defs to allow for
+# a compact cross platform Makefile
+all: problem.c $(LIBREBOUND)
+	@echo "Compiling $< ..."
+	$(CCPROBLEM)
 	@echo ""
-	@echo "Compiling problem file ..."
-	$(CC) -I../../src/ -Wl,-rpath,./ $(OPT) $(PREDEF) problem.c -L. -lrebound $(LIB) -o rebound
+	@echo "Compilation successful. To run REBOUND, execute the file '$(EXEREBOUND)'."
 	@echo ""
-	@echo "REBOUND compiled successfully."
 
-librebound: 
-	@echo "Compiling shared library librebound.so ..."
+$(LIBREBOUND): 
+	@echo "Compiling shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/
-	@-rm -f librebound.so
-	@ln -s ../../src/librebound.so .
+	@-$(RM) $(LIBREBOUND)
+	@$(LINKORCOPYLIBREBOUND)
+	@echo ""
 
 clean:
-	@echo "Cleaning up shared library librebound.so ..."
-	@-rm -f librebound.so
+	@echo "Cleaning up shared library $(LIBREBOUND) ..."
 	$(MAKE) -C ../../src/ clean
 	@echo "Cleaning up local directory ..."
-	@-rm -vf rebound
+	@-$(RM) $(LIBREBOUND)
+	@-$(RM) $(EXEREBOUND)