diff --git a/makefile b/makefile index 812824b5661535c2bd5602059fc8b92ca3d496b4..d1f3936815888d8824d83806bed2899d76dd160d 100644 --- a/makefile +++ b/makefile @@ -1,25 +1,25 @@ -CC = g++ -CFLAGS = -Wall -O3 -c -LFLAGS = -s -lm - -PROG = DrawArea -HDR_FILES = DrawArea.h pnm.h ParseArgs.h Error.h -OBJ_FILES = Graph.o WayPoint.o ClosedList.o OpenList.o DrawArea.o - -SRC_DIR = ./src -OBJ_DIR = ./obj - -HDR = $(HDR_FILES:%=$(SRC_DIR)/%) -OBJ = $(OBJ_FILES:%=$(OBJ_DIR)/%) - -$(PROG): $(OBJ) $(HDR) - $(CC) $(LFLAGS) -o $(PROG) $(OBJ) - -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp object - $(CC) $(CFLAGS) $< -o $@ - -object: - mkdir -p $(OBJ_DIR) - -clean: - rm -rf $(OBJ_DIR) $(PROG) +CC = g++ +CFLAGS = -Wall -O3 -c +LFLAGS = -s -lm + +PROG = DrawArea +HDR_FILES = DrawArea.h pnm.h ParseArgs.h Error.h +OBJ_FILES = Graph.o WayPoint.o ClosedList.o OpenList.o DrawArea.o + +SRC_DIR = ./src +OBJ_DIR = ./obj + +HDR = $(HDR_FILES:%=$(SRC_DIR)/%) +OBJ = $(OBJ_FILES:%=$(OBJ_DIR)/%) + +$(PROG): $(OBJ) $(HDR) + $(CC) $(LFLAGS) -o $(PROG) $(OBJ) + +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp object + $(CC) $(CFLAGS) $< -o $@ + +object: + mkdir -p $(OBJ_DIR) + +clean: + rm -rf $(OBJ_DIR) $(PROG) diff --git a/makefile.mpi b/makefile.mpi index 36b9741f948cb0165d599aeaedfafc0f5cfbd0bc..e4967fdf5fad8b67af41e0066cd9de6fa41dc679 100644 --- a/makefile.mpi +++ b/makefile.mpi @@ -1,25 +1,25 @@ -CC = mpiCC -DDRAWAREA_MPI -CFLAGS = -Wall -O3 -c -LFLAGS = -s -lm - -PROG = DrawArea-mpi -HDR_FILES = DrawArea.h pnm.h ParseArgs.h Error.h -OBJ_FILES = Graph.o WayPoint.o ClosedList.o OpenList.o DrawArea.o - -SRC_DIR = ./src -OBJ_DIR = ./obj - -HDR = $(HDR_FILES:%=$(SRC_DIR)/%) -OBJ = $(OBJ_FILES:%=$(OBJ_DIR)/%) - -$(PROG): $(OBJ) $(HDR) - $(CC) $(LDFLAGS) $(LFLAGS) -o $(PROG) $(OBJ) - -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp object - $(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ - -object: - mkdir -p $(OBJ_DIR) - -clean: - rm -rf $(OBJ_DIR) $(PROG) +CC = mpiCC -DDRAWAREA_MPI +CFLAGS = -Wall -O3 -c +LFLAGS = -s -lm + +PROG = DrawArea-mpi +HDR_FILES = DrawArea.h pnm.h ParseArgs.h Error.h +OBJ_FILES = Graph.o WayPoint.o ClosedList.o OpenList.o DrawArea.o + +SRC_DIR = ./src +OBJ_DIR = ./obj + +HDR = $(HDR_FILES:%=$(SRC_DIR)/%) +OBJ = $(OBJ_FILES:%=$(OBJ_DIR)/%) + +$(PROG): $(OBJ) $(HDR) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(PROG) $(OBJ) + +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp object + $(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ + +object: + mkdir -p $(OBJ_DIR) + +clean: + rm -rf $(OBJ_DIR) $(PROG)