From 7ffc1483585cde21c28dbb6aaada01eec85e9a47 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 27 Nov 2024 09:28:14 -0500 Subject: [PATCH] build: I wanted to get the binary out of the makefile to appease F-Droid, and one thing lead to another. --- GNUmakefile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 10d867472..f2ec31b37 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -3,7 +3,7 @@ MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --no-builtin-rules -## == Tilde Friends build. == +## == Tilde Friends build. == ## ## This is a list of all supported build targets. ## @@ -11,10 +11,10 @@ MAKEFLAGS += --no-builtin-rules ## parallel (faster). ## ## Useful variables to override: -## CC Compiler. -## AS Assembler. -## LD Linker. -## ANDROID_SDK Path to the Android SDK. +## CC := Compiler. +## AS := Assembler. +## LD := Linker. +## ANDROID_SDK := Path to the Android SDK. VERSION_CODE := 30 VERSION_NUMBER := 0.0.25-wip @@ -1248,9 +1248,18 @@ help: ## Display this help message. @awk \ -F: \ -vG=$$(tput setaf 2) \ + -vO=$$(tput setaf 3) \ + -vB=$$(tput setaf 4) \ + -vM=$$(tput setaf 5) \ + -vC=$$(tput setaf 6) \ -vR=$$(tput sgr0) ' \ - /^##/ { sub(/^##\s?/, ""); printf "%s%s%s\n", G, $$0, R } \ - /^[[:alnum:]-]+:.*##/ { sub(/:.*##\s?/, ":"); printf "%s%-20s%s %s\n", G, $$1, R, $$2 } \ + /^## ==.*==$$/ { sub(/^## ?/, ""); printf "%s%s%s\n", C, $$0, R } \ + /^##.*:\=.*/ { sub(/^## ?/, ""); sub(/:\=/, ":"); printf " %s%-20s%s %s%s%s\n", M, $$1, R, O, $$2, R } \ + /^##/ { sub(/^## ?/, ""); print $$0 } \ + /^[[:alnum:]-]+:.*##/ { \ + sub(/:.*##\s?/, ":"); \ + printf " %s%-20s%s %s%s%s\n", G, $$1, R, O, $$2, R \ + } \ ' < $(filter-out %.d,$(MAKEFILE_LIST)) @echo "" # Blank line. .PHONY: help