From 31dacd32796b889ef1e26be17df92484e89a7da1 Mon Sep 17 00:00:00 2001
From: Florian Wolf <florian.wolf@idiv.de>
Date: Thu, 6 Oct 2016 15:05:31 +0200
Subject: [PATCH] removes carriage returns from makefiles

---
 makefile     | 50 +++++++++++++++++++++++++-------------------------
 makefile.mpi | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/makefile b/makefile
index 812824b..d1f3936 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 36b9741..e4967fd 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)
-- 
GitLab