Parallel Programming - Single threaded version done

[matches/honours.git] / course / semester2 / pprog / assignment1 / Makefile

diff --git a/course/semester2/pprog/assignment1/Makefile b/course/semester2/pprog/assignment1/Makefile
index b1a9b13..c164624 100644 (file)
--- a/course/semester2/pprog/assignment1/Makefile
+++ b/course/semester2/pprog/assignment1/Makefile
@@ -1,20 +1,23 @@
 #Makefile for nbody program
 
-CXX = gcc --std=c99 -Wall -pedantic  -g -lm -lGL -lglut -lGLU -lpthread -fopenmp
+CXX = gcc
+LIBRARIES = -lm -lGL -lglut -lGLU -lpthread
+FLAGS = --std=c99 -Wall -pedantic -g
+PREPROCESSOR_FLAGS = -fopenmp
 LINK_OBJ = main.o nbody.o graphics.o
 
 BIN = nbody
 
-$(BIN) : $(OBJ) 
-       $(CXX) -o $(BIN) $(OBJ)
+$(BIN) : $(LINK_OBJ) 
+       $(CXX) -o $(BIN) $(LINK_OBJ) $(LIBRARIES)
 
 %.o : %.c
-       $(CXX) -c $<
+       $(CXX) $(FLAGS) $(PREPROCESSOR_FLAGS) -c $<
 
 clean :
-       $(RM) $(BIN) $(OBJ) $(LINKOBJ)
+       $(RM) $(BIN) $(OBJ) $(LINK_OBJ)
 
 clean_full: #cleans up all backup files
-       $(RM) $(BIN) $(OBJ) $(LINKOBJ)
+       $(RM) $(BIN) $(OBJ) $(LINK_OBJ)
        $(RM) *.*~
        $(RM) *~