Merge branch 'main' into testing

Makefile

@@ -1,62 +1,88 @@
 # Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
 # Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
 # Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
+# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
 # SPDX-License-Identifier: FSFAP
 #
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved.  This file is offered as-is, without any warranty.
 
+# The octal escape \043 is utilized twice in this file as make(1p) will
+# interpret a hash in a rule as an inline comment.
+
 .POSIX:
-.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
-.PRAGMA: command_comment # breaks without this?
 
-PREFIX=/usr/local
+DESTDIR ?= dist
+PREFIX ?= /usr/local
 
-CC=cc
-MAKE=make
-RUSTC=rustc
+MANDIR != [ $(PREFIX) = / ] && printf '/usr/share/man\n' \
+	|| printf '/share/man\n'
+SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
+	| sed -n 's/sysexits\.h//p' || printf 'include\n'
+
+CC ?= cc
+RUSTC ?= rustc
+RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
+	--extern sysexits=build/o/libsysexits.rlib \
+	--extern strerror=build/o/libstrerror.rlib
+CFLAGS += -I$(SYSEXITS)
 
 .PHONY: all
-all: dj false fop hru intcmp rpn scrut str strcmp true
+all: docs dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
 
+# keep build/include until bindgen(1) has stdin support
+# https://github.com/rust-lang/rust-bindgen/issues/2703
 build:
-	# keep build/include until bindgen(1) has stdin support
-	# https://github.com/rust-lang/rust-bindgen/issues/2703
-	mkdir -p build/bin build/include build/lib build/o build/test
+	mkdir -p build/bin build/docs build/include build/lib build/o build/test
 
 .PHONY: clean
 clean:
-	rm -rf build/ dist/
+	rm -rf build dist
 
 dist: all
-	mkdir -p dist/bin dist/share/man/man1
-	cp build/bin/* dist/bin/
-	cp docs/*.1 dist/share/man/man1/
+	mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/man/man1
+	cp build/bin/* $(DESTDIR)/$(PREFIX)/bin
+	cp build/docs/*.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1
 
 .PHONY: install
 install: dist
-	mkdir -p $(PREFIX)
-	cp -r dist/* $(PREFIX)/
+	cp -r $(DESTDIR)/* /
 
 .PHONY: test
-test: all
+test: all build /tmp/getopt
 	tests/test.sh
-	$(RUSTC) --test src/getopt-rs/lib.rs -o build/test/getopt
+	/tmp/getopt
 
-build/o/libsysexits.rlib: build
-	# bandage solution until bindgen(1) gets stdin support
-	printf '#define EXIT_FAILURE 1\n' | cat - include/sysexits.h \
-		> build/include/sysexits.h 
-	bindgen --default-macro-constant-type signed --use-core --formatter=none \
-		"$$(printf '#include <sysexits.h>\n' \
-			| cpp -M -idirafter "build/include" - \
-			| sed 's/ /\n/g' | grep sysexits.h)" \
-		| $(RUSTC) $(RUSTFLAGS) --crate-type lib -o build/o/libsysexits.rlib -
+/tmp/getopt: src/libgetopt.rs
+	$(RUSTC) --test -o /tmp/getopt src/libgetopt.rs
 
-build/o/libgetopt.rlib: src/getopt-rs/lib.rs
+.PHONY: docs
+docs: docs/ build
+	for file in docs/*; do original="$$(sed -n '/^\.TH/p' <"$$file")"; \
+		title="$$(printf '%s\n' "$$original" | sed \
+		"s/X\.X\.X/$$(git describe --tags --long | cut -d'-' -f1)/g")"; \
+		sed "s/$$original/$$title/g" <"$$file" >"build/$$file"; done
+
+.PHONY: rustlibs
+rustlibs: build/o/libsysexits.rlib build/o/libgetopt.rlib \
+	build/o/libstrerror.rlib
+
+build/o/libgetopt.rlib: build src/libgetopt.rs
 	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
-		-o build/o/libgetopt.rlib src/getopt-rs/lib.rs
+		-o $@ src/libgetopt.rs
+
+build/o/libstrerror.rlib: build src/libstrerror.rs
+	$(RUSTC) $(RUSTFLAGS) --crate-type=lib -o $@ \
+		src/libstrerror.rs
+
+build/o/libsysexits.rlib: build/include/sysexits.h
+	bindgen --default-macro-constant-type signed --use-core --formatter=none \
+		build/include/sysexits.h | $(RUSTC) $(RUSTFLAGS) --crate-type lib -o $@ -
+
+# bandage solution until bindgen(1) gets stdin support
+build/include/sysexits.h: build $(SYSEXITS)sysexits.h
+	printf '\043define EXIT_FAILURE 1\n' | cat - $(SYSEXITS)sysexits.h > $@
 
 .PHONY: dj
 dj: build/bin/dj
@@ -70,29 +96,33 @@ build/bin/false: src/false.c build
 
 .PHONY: fop
 fop: build/bin/fop
-build/bin/fop: src/fop.rs build build/o/libgetopt.rlib build/o/libsysexits.rlib
-	$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
-		--extern sysexits=build/o/libsysexits.rlib \
-		-o $@ src/fop.rs
+build/bin/fop: src/fop.rs build rustlibs
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/fop.rs
 
 .PHONY: hru
 hru: build/bin/hru
-build/bin/hru: src/hru.rs build build/o/libgetopt.rlib build/o/libsysexits.rlib
-	$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
-		--extern sysexits=build/o/libsysexits.rlib \
-		-o $@ src/hru.rs
+build/bin/hru: src/hru.rs build rustlibs 
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/hru.rs
 
 .PHONY: intcmp
 intcmp: build/bin/intcmp
 build/bin/intcmp: src/intcmp.c build
 	$(CC) $(CFLAGS) -o $@ src/intcmp.c
 
+.PHONY: mm
+mm: build/bin/mm
+build/bin/mm: src/mm.c build
+	$(CC) $(CFLAGS) -o $@ src/mm.c
+
+.PHONY: npc
+npc: build/bin/npc
+build/bin/npc: src/npc.c build
+	$(CC) $(CFLAGAS) -o $@ src/npc.c
+
 .PHONY: rpn
 rpn: build/bin/rpn
-build/bin/rpn: src/rpn.rs build build/o/libsysexits.rlib
-	$(RUSTC) $(RUSTFLAGS) \
-		--extern sysexits=build/o/libsysexits.rlib \
-		-o $@ src/rpn.rs
+build/bin/rpn: src/rpn.rs build rustlibs
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/rpn.rs
 
 .PHONY: scrut
 scrut: build/bin/scrut
@@ -109,6 +139,11 @@ strcmp: build/bin/strcmp
 build/bin/strcmp: src/strcmp.c build
 	$(CC) $(CFLAGS) -o $@ src/strcmp.c
 
+.PHONY: swab
+swab: build/bin/swab
+build/bin/swab: src/swab.rs build rustlibs
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/swab.rs
+
 .PHONY: true
 true: build/bin/true
 build/bin/true: src/true.c build