fix bmake compilation

6 files changed, 133 insertions, 75 deletions

diff --git a/.gitignore b/.gitignore
index f145cc2..68c0d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ build
 gen
 qbt
 *.t
-!gen/.gitkeep
+!gen/source.mk
 !include/qbt
diff --git a/Makefile b/Makefile
index e89237d..a75b0ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,67 +1,56 @@
-DO	!= echo -n > deps.mk
+.PHONY: all
+all: setup
+	$(MAKE) -f scripts/makefile
 
-DEBUGFLAGS	!= [ $(RELEASE) ] && echo "-flto=auto -O2 -DNODEBUG" || echo "-O0 -DDEBUG"
-CFLAGS		= -Wall -Wextra -g
-DEPFLAGS	= -MT $@ -MMD -MP -MF $@.d
-LINTFLAGS	= -fsyntax-only
-INCLUDEFLAGS	= -Iinclude
-COMPILEFLAGS	=
-LINKFLAGS	=
+# this kicks all unrecognised targets to the client script.
+# note that trying to compile individual files, e.g.
+#
+#	make kernel.elf
+#
+# will not work, you would need
+#
+#	make -f scripts/makefile kernel.elf
+#
+# instead
+.DEFAULT: setup
+	$(MAKE) -f scripts/makefile $<
 
-all: qbt
+.PHONY:
+setup:
+	@echo -n > deps.mk
+	@./scripts/gen-deps -p QBT -c COMPILE_QBT -b qbt "$(QBT_SOURCES)"
 
-# default values
-CROSS_COMPILE	?=
-
-# common programs
-CC		= gcc
-
-SOURCES		:=
+CLEANUP		:= build deps.mk qbt
+CLEANUP_CMD	:=
+QBT_SOURCES	:=
 
 include src/source.mk
 
-COMPILE		= $(CROSS_COMPILE)$(CC) $(DEBUGFLAGS)\
-		  $(CFLAGS) $(DEPFLAGS) $(COMPILEFLAGS) $(INCLUDEFLAGS)
-
-LINT		= $(COMPILE) $(LINTFLAGS)
-
-OBJS		!= ./scripts/gen-deps --sources "$(SOURCES)"
-
-include deps.mk
-
-.PHONY: lint
-lint: $(OBJS:.o=.o.l)
-
 .PHONY: format
 format:
-	find src include tests -iname '*.[ch]' |\
-		xargs -n 10 -P 0 uncrustify -c uncrustify.conf --no-backup -F -
+	find src include -iname '*.[ch]' |\
+		xargs uncrustify -c uncrustify.conf --no-backup -F -
 
 .PHONY: license
 license:
-	find src include tests -iname '*.[ch]' |\
-		xargs -n 10 -P 0 ./scripts/license
+	find src include -iname '*.[ch]' |\
+		xargs ./scripts/license
 
 .PHONY: docs
 docs:
-	find src include -iname '*.[ch]' |\
+	find src include -iname '*.[ch]' -not -path */gen/* |\
 		xargs ./scripts/warn-undocumented
 	doxygen docs/doxygen.conf
 
-.PHONY: check
-check: ek
-	./tests/check.sh
-
-qbt: $(OBJS)
-	$(COMPILE) $(OBJS) -o $@
+RM	= rm
 
 .PHONY: clean
 clean:
-	$(RM) -r build qbt deps.mk
+	$(RM) -rf $(CLEANUP)
 
 .PHONY: clean_docs
 clean_docs:
-	$(RM) -r docs/output
+	$(RM) -rf docs/output
 
 .PHONY: clean_all
 clean_all: clean clean_docs
diff --git a/gen/source.mk b/gen/source.mk
new file mode 100644
index 0000000..10295b2
--- /dev/null
+++ b/gen/source.mk
@@ -0,0 +1,5 @@
+gen/gen_parser.c: src/parser.y gen/gen_lexer.inc
+	bison -Wcounterexamples -o gen/gen_parser.c src/parser.y
+
+gen/gen_lexer.inc: src/lexer.l
+	flex -o gen/gen_lexer.inc src/lexer.l
diff --git a/scripts/gen-deps b/scripts/gen-deps
index 0feed7e..f45707c 100755
--- a/scripts/gen-deps
+++ b/scripts/gen-deps
@@ -1,35 +1,37 @@
 #!/bin/sh
 
-gencommon () {
-	lint="build/${s%.*}${1}.l"
-	dep="build/${s%.*}${1}.d"
-	obj="build/${s%.*}${1}"
+PREFIX=
+COMPILE=COMPILE
+LINT=LINT
+BUILD=build/
 
-	echo "${dep}:"		>> deps.mk
-	echo "include ${dep}"	>> deps.mk
-	echo "${obj}: ${s}"	>> deps.mk
-}
-
-genobjs () {
-	gencommon ".o"
-	echo "${obj}: ${s}"	>> deps.mk
-	echo "	\$(COMPILE) -c $< -o \$@" >> deps.mk
-
-	echo "${lint}: ${s}" >> deps.mk
-	echo "	\$(LINT) -c ${s} -o /dev/null" >> deps.mk
-}
+while getopts "p:c:b:l:" opt; do
+	case "$opt" in
+		p) PREFIX="$OPTARG"_;;
+		c) COMPILE="$OPTARG";;
+		l) LINT="$OPTARG";;
+		b) BUILD=build/"$OPTARG";;
+		*) echo "unrecognised option -$OPTARG" >&2; exit 1;;
+	esac
+done
 
-case "${1}" in
-	--sources)
-		func=genobjs
-		;;
-esac
+shift $((OPTIND - 1))
 
 # create all subdirectories
-mkdir -p $(echo "${2}" | xargs dirname | uniq | sed 's|^|build/|g')
+mkdir -p $(echo "${@}" | tr ' ' '\n' | sed "s|[^/]*$||;s|^|${BUILD}/|" | uniq)
 
-for s in ${2}
+for s in ${@}
 do
-	${func} ${suffix}
-	echo ${obj}
+	obj="${BUILD}/${s%.*}.o"
+	lint="${obj}.l"
+	dep="${obj}.d"
+
+	echo "${PREFIX}OBJS += ${obj}"			>> deps.mk
+	echo "${PREFIX}LINTS += ${lint}"		>> deps.mk
+	echo "${dep}:"					>> deps.mk
+	echo "-include ${dep}"				>> deps.mk
+	echo "${obj}: ${s}"				>> deps.mk
+	echo "	\$(${COMPILE}) -c ${s} -o ${obj}"	>> deps.mk
+	echo "${lint}: ${s}"				>> deps.mk
+	echo "	\$(${LINT}) -c ${s} -o /dev/null"	>> deps.mk
 done
diff --git a/scripts/makefile b/scripts/makefile
new file mode 100644
index 0000000..b416c35
--- /dev/null
+++ b/scripts/makefile
@@ -0,0 +1,68 @@
+# this could be done better
+RELEASE		?= 0
+OPTFLAGS	!= [ "$(RELEASE)" != "0" ] \
+			&& echo "-O3 -flto" \
+			|| echo "-O0"
+
+DEBUG		?= 1
+DEBUGFLAGS	!= [ "$(DEBUG)" != "0" ] \
+			&& echo "-DDEBUG=1" \
+			|| echo "-DNDEBUG=1"
+
+ASSERT		?= 1
+ASSERTFLAGS	!= [ "$(ASSERT)" != "0" ] \
+			&& echo "-DASSERT=1" \
+			|| echo
+
+DEPFLAGS	= -MT $@ -MMD -MP -MF $@.d
+LINTFLAGS	:= -fsyntax-only
+PREPROCESS	:= -E
+
+LLVM		?= 0
+BUILD		:= build
+
+all: qbt
+
+include gen/source.mk
+
+# default values, overwrite if/when needed
+CROSS_COMPILE	:=
+
+OBJCOPY		!= [ "$(LLVM)" != "0" ] \
+			&& echo llvm-objcopy \
+			|| echo $(CROSS_COMPILE)objcopy
+
+COMPILER	!= [ "$(LLVM)" != "0" ] \
+			&& echo clang --target="$(CROSS_COMPILE)" \
+			|| echo $(CROSS_COMPILE)gcc
+
+
+OBFLAGS		:= -g
+WARNFLAGS	:= -Wall -Wextra
+
+COMPILE_FLAGS	:= $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(OBFLAGS) $(ASSERTFLAGS) \
+		   $(DEBUGFLAGS)
+
+INCLUDE_FLAGS	:= -I include
+
+COMPILE		= $(COMPILER) \
+		  $(COMPILE_FLAGS) $(DEPFLAGS) $(INCLUDE_FLAGS)
+
+LINT		= $(COMPILER) \
+		  $(COMPILE_FLAGS) $(LINTFLAGS) $(INCLUDE_FLAGS)
+
+UBSAN		?= 0
+TRISCV_FLAGS	!= [ "$(UBSAN)" != "0" ] \
+			&& echo -fsanitize=undefined \
+			|| echo
+
+COMPILE_QBT	= $(COMPILE) $(QBT_FLAGS)
+
+-include deps.mk
+
+qbt: $(QBT_OBJS)
+	$(COMPILE_QBT) $(QBT_OBJS) -o $@
+
+# might lint some common things twice
+.PHONY:
+lint: $(TRISCV_LINTS)
diff --git a/src/source.mk b/src/source.mk
index 9fad368..5fedca2 100644
--- a/src/source.mk
+++ b/src/source.mk
@@ -1,8 +1,2 @@
 SRC_LOCAL != echo src/*.c
-SOURCES += $(SRC_LOCAL) gen/gen_parser.c
-
-gen/gen_parser.c: src/parser.y gen/gen_lexer.inc
-	bison -Wcounterexamples -o gen/gen_parser.c src/parser.y
-
-gen/gen_lexer.inc: src/lexer.l
-	flex -o gen/gen_lexer.inc src/lexer.l
+QBT_SOURCES := $(QBT_SOURCES) $(SRC_LOCAL) gen/gen_parser.c