SURPRISE Build System Update

diff --git a/Makefile b/Makefile
index b364514698f8e0219218e3f464a9738e08be61df..3b90c07597fbd1c689a492b48518fa47045a0f20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,36 @@
-include chad.mk
-DEBUG:=1
-CFLAGS:=-std=c99 -O2 $(if ${DEBUG}, ${CHAD_DEBUG},'')
-CPPFLAGS:=-D_FORTIFY_SOURCE=2
+include config.mk
+
+SRC.dir:=source
+OBJ.dir:=obj
 
-SRC.dir:=source/
 SRC:=$(shell find ${SRC.dir} -iname '*.c')
 HDR:=$(shell find ${SRC.dir} -iname '*.h')
-OBJ:=$(subst .c,.o,${SRC})
-
-OUT:=hl
-OUTARGS:=${OUT} < source/main.c
+OBJ:=$(SRC:.c=.o)
 
-main: ${OBJ} ${HDR}
-       ${LINK.c} ${OBJ} -o hl
+VPATH=${SRC.dir} ${OBJ.dir}
 
-%.o: %.c
+${OBJ.dir}/%.o: ${SRC.dir}/%.c
        ${COMPILE.c} $< -o $@
 
-install:
-       cp hl /usr/bin/hl
+${TARGET}: ${OBJ} | ${HDR}
+       ${LINK.c} $+ -o $@
+
+${SRC} ${HDR}:
+
+${PREFIX} ${OBJ.dir}:
+       mkdir -p $@
+
+install: ${PREFIX}
+       install -v -g ${USER} -o ${USER} -m 744 ${TARGET} ${PREFIX}/bin/
+
+uninstall:
+       -rm ${PREFIX}/bin/${TARGET}
 
 clean:
-       -rm ${OBJ}
-       -rm ${OUT}
+       -rm ${OBJ} ${TARGET}
 
 test: chad_test
+
+.PHONY: test clean install
+
+.DEFAULT_GOAL:=${TARGET}

diff --git a/chad.mk b/chad.mk
deleted file mode 100644 (file)
index 0b30673..0000000
--- a/chad.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Make script for Chad projects
-# This script depends on the following variables
-#  - OUT       : output program name
-#  - OUTARGS   : default flags to fork ${OUT} with
-
-#
-CHAD_DEBUG:=-Og -ggdb -pg -fno-inline
-
-# Programs to check warnings for as defined by the Chad standard
-GCC:=gcc
-GCC.warnings:=-Wall -Wextra -Wpedantic -Wvla -Wshadow -Wundef 
-CLANG:=clang
-CLANG.warnings:=-Weverything
-VALGRIND:=valgrind
-VALGRIND.flags:=--track-origins=yes --leak-check=full --show-leak-kinds=all
-
-chad_test:
-       ${GCC} ${GCC.warnings} ${SRC} -o ${OUT}
-       ${CLANG} ${GCC.warnings} ${SRC} -o ${OUT}
-       ${VALGRIND} ${VALGRIND.flags} ${OUT} ${OUTARGS}
-
-.DEFAULT_GOAL:=main

diff --git a/config.mk b/config.mk
new file mode 100644 (file)
index 0000000..019ce15
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,36 @@
+# Make script for Chad projects
+# This script depends on the following variables
+#  - TARGET    : output program name
+#  - ARGS      : default flags to fork ${OUT} with
+
+PREFIX:=/usr/bin
+
+CFLAGS:=-std=c99
+CPPFLAGS:=-D_GNU_SOURCE -D_FORTIFY_SOURCE=2
+
+DEBUG=1
+
+ifeq (${DEBUG},1)
+       CFLAGS += -Og -ggdb -pg -fno-inline
+else
+       CFLAGS += -O2 -flto=auto
+endif
+
+# Programs to check warnings for as defined by the chad standard
+
+GCC:=gcc
+GCC.warnings:=-Wall -Wextra -Wpedantic -Wvla -Wshadow -Wundef
+
+CLANG:=clang
+CLANG.warnings:=-Weverything
+
+VALGRIND:=valgrind
+VALGRIND.flags:=--track-origins=yes --leak-check=full --show-leak-kinds=all
+
+TARGET:=hl
+ARGS:=${TARGET} < source/main.c
+
+chad_test:
+       ${GCC} ${GCC.warnings} ${SRC} -o ${TARGET}
+       ${CLANG} ${GCC.warnings} ${SRC} -o ${TARGET}
+       ${VALGRIND} ${VALGRIND.flags} ${TARGET} ${ARGS}

diff --git a/source/hl_xolatile.c b/source/hl_xolatile.c
index 3a5054c49ae2546879b0aa7600931298fec61cf0..a264c20184dabfb9ad358510a610170f12282d87 100755 (executable)
--- a/source/hl_xolatile.c
+++ b/source/hl_xolatile.c
@@ -1,3 +1,4 @@
+#if 0
 // Listen, this is still prototype, it's not code-merged with other stuff...
 // Once I prototype out more stuff, this will use chad.h and hl.h...
 // So, this file can run on its' own when compiled, gonna rewrite later.
@@ -244,3 +245,4 @@ int main(int      argc,
 
        return 0;
 }
+#endif

diff --git a/source/main.c b/source/main.c
index a43c8cf7e1d73e8371387d1def35a7f3b36c7b69..889eee6ac99c65e7a1b55a7aeb82ae53b0e32673 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -1,5 +1,6 @@
 //register
 //putchar()
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -52,7 +53,8 @@ int main(int      argc,
                        buffer = realloc(buffer, ++chunks * ALLOCATION_CHUNK);
                }
                buffer[buffer_size] = '\0';
-               read(STDIN_FILENO, &buffer[buffer_size], sizeof (*buffer));
+               /* TODO handle me */
+               assert(read(STDIN_FILENO, &buffer[buffer_size], sizeof (*buffer)) != -1);
                ++buffer_size;
        } while (buffer[buffer_size - 1]);