From 763de413ac07b5c5ef379a62bdbb3b54897852cf Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Tue, 4 Aug 2020 15:07:31 -0400
Subject: [PATCH] chore: makefile cleanup

---
 runtime/Makefile | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/runtime/Makefile b/runtime/Makefile
index 24f41bd..0bb79a1 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -8,41 +8,44 @@ CC_OPTIONS = -O3 -flto -g -pthread -D_GNU_SOURCE
 
 BINARY_NAME=sledgert
 
-NCORES = ${TOTAL_CORES} # Number of Cores. Options: {2...N or TOTAL_CORES}
-USE_MEM = USE_MEM_VM # Options: {USE_MEM_GENERIC, USE_MEM_VM}
+# Number of Cores. Options: {2...N or TOTAL_CORES}
+NCORES = ${TOTAL_CORES}
 
-INCLUDES += -Iinclude/ -Ithirdparty/dist/include/
-
-# CFILES
-CFILES += src/*.c 
-CFILES += src/arch/${ARCH}/*.c 
-CFILES += src/libc/*.c 
-CFILES += src/memory/common.c 
-CFILES += thirdparty/dist/lib/http_parser.o
-# TODO: Is USE_MEM_GENERIC out of date? I do not see that file.
-# Does that mean we can make USE_MEM_VM an invariant?
-ifeq ($(USE_MEM),USE_MEM_GENERIC)
-CFILES += src/memory/generic.c
-else ifeq ($(USE_MEM),USE_MEM_VM)
-CFILES += src/memory/64bit_nix.c
-endif
+# Options: {USE_MEM_GENERIC, USE_MEM_VM}
+USE_MEM = USE_MEM_VM
 
 # Flags
 CFLAGS += -D${ARCH}
-#CFLAGS += -DDEBUG 
+#CFLAGS += -DDEBUG
 #CFLAGS += -DLOG_TO_FILE
 CFLAGS += -DNCORES=${NCORES}
 CFLAGS += -DPAGE_SIZE=$(PAGE_SIZE)
 #CFLAGS += -DPREEMPT_DISABLE
 #CFLAGS += -DUSE_HTTP_UVIO #-DUSE_HTTP_SYNC
-CFLAGS += -D${USE_MEM}  
+CFLAGS += -D${USE_MEM}
 #CFLAGS += -DUSE_SYSCALL
 
+# Preprocessor
 LDFLAGS += -Wl,--export-dynamic -ldl -lm
 LDFLAGS += -Lthirdparty/dist/lib/
+INCLUDES += -Iinclude/ -Ithirdparty/dist/include/
+
+# CFILES
+CFILES += src/*.c
+CFILES += src/arch/${ARCH}/*.c
+CFILES += src/libc/*.c
+CFILES += src/memory/common.c
+CFILES += thirdparty/dist/lib/http_parser.o
+# TODO: Is USE_MEM_GENERIC out of date? I do not see that file.
+# Does that mean we can make USE_MEM_VM an invariant?
+ifeq ($(USE_MEM),USE_MEM_GENERIC)
+CFILES += src/memory/generic.c
+else ifeq ($(USE_MEM),USE_MEM_VM)
+CFILES += src/memory/64bit_nix.c
+endif
 
-# Configuring JasmineEEE
-JSMNCFLAGS += -DJSMN_STATIC 
+# Configuring Jasmine
+JSMNCFLAGS += -DJSMN_STATIC
 JSMNCFLAGS += -DJSMN_STRICT
 
 all: clean runtime