From b64418b584b9d4072e04e3a56edcf70ddd0b9f4f Mon Sep 17 00:00:00 2001
From: CismonX <admin@cismon.net>
Date: Thu, 13 Dec 2018 20:52:46 +0800
Subject: [PATCH] Correct include precedence. Update Makefile.

---
 Makefile       | 6 +++---
 src/reader.cpp | 4 ++--
 src/writer.cpp | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9113b05..a739be0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SOURCES     = $(wildcard src/*.cpp)
 OBJECTS     = $(SOURCES:%.cpp=%.o)
 APPLICATION = arma-flow
-CXXFLAGS    = -Wall -c -O2 -std=c++17 -o
+CXXFLAGS    = -Wall -c -O2 -std=c++17
 LDFLAGS     = -larmadillo -ljanus -lstdc++fs
 
 all:            ${OBJECTS} ${APPLICATION}
@@ -10,7 +10,7 @@ ${APPLICATION}: ${OBJECTS}
 	${CXX} -o $@ ${OBJECTS} ${LDFLAGS}
 
 ${OBJECTS}:
-	${CXX} ${CXXFLAGS} $@ ${@:%.o=%.cpp}
+	${CXX} ${CXXFLAGS} -o $@ ${@:%.o=%.cpp}
 
 clean:
-	rm -f ${APPLICATION} ${OBJECTS}
\ No newline at end of file
+	rm -f ${APPLICATION} ${OBJECTS}
diff --git a/src/reader.cpp b/src/reader.cpp
index 7207ff8..ae487f8 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -4,10 +4,10 @@
 // @author CismonX
 //
 
-#include <experimental/filesystem>
-
 #include "reader.hpp"
 
+#include <experimental/filesystem>
+
 namespace flow
 {
     bool reader::from_csv_file(const std::string& path, bool remove_first_line)
diff --git a/src/writer.cpp b/src/writer.cpp
index 3dadb96..2c4b42c 100644
--- a/src/writer.cpp
+++ b/src/writer.cpp
@@ -4,6 +4,8 @@
 // @author CismonX
 //
 
+#include "writer.hpp"
+
 #ifdef _WIN32
 #include <Windows.h>
 #else
@@ -12,8 +14,6 @@
 #include <iomanip>
 #include <experimental/filesystem>
 
-#include "writer.hpp"
-
 namespace flow
 {
     int writer::max_elems_per_line()