From 622c13021d23d616a03b71cec0b5ca67926514be Mon Sep 17 00:00:00 2001 From: emma Date: Mon, 15 Jan 2024 14:34:59 -0700 Subject: [PATCH] GNUmakefile: replaced with POSIX Makefile --- .gitignore | 1 + GNUmakefile => Makefile | 73 +++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 39 deletions(-) rename GNUmakefile => Makefile (55%) diff --git a/.gitignore b/.gitignore index 567609b..edd9d60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build/ +dist/ diff --git a/GNUmakefile b/Makefile similarity index 55% rename from GNUmakefile rename to Makefile index 7722d7f..871b5ba 100644 --- a/GNUmakefile +++ b/Makefile @@ -7,9 +7,10 @@ # permitted in any medium without royalty provided the copyright notice and this # notice are preserved. This file is offered as-is, without any warranty. -# If we want to use POSIX make we can’t use ifeq -# .POSIX: -# .PRAGMA: posix_202x +.POSIX: +.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1) + +.PHONY: all .PHONY: clean .PHONY: install .PHONY: test @@ -19,73 +20,67 @@ PREFIX=/usr/local CC=cc CFLAGS=-O3 -Lbuild/lib -idirafter include -RUSTC=rustc +nightly -RUSTCFLAGS=-Zlocation-detail=none -Copt-level=z -Ccodegen-units=1 \ - -Cpanic=abort -Clto=y -Cstrip=symbols -Ctarget-cpu=native \ +RUSTC=rustc +RUSTCFLAGS=-Copt-level=z -Ccodegen-units=1 -Cpanic=abort -Clto=y \ + -Cstrip=symbols -Ctarget-cpu=native \ --extern sysexits=build/o/libsysexits.rlib -ifeq ($(CC), gcc) - CFLAGS=-O3 -s -Wl,-z,noseparate-code,-z,nosectionheader -flto -Lbuild/lib \ - -idirafter include -endif +all: false fop intcmp scrut str strcmp true test -ifeq ($(CC), clang) - CFLAGS=-O3 -Wall -Lbuild/lib -idirafter include -endif - -ifeq ($(CC), tcc) - CFLAGS=-O3 -s -Wl -flto -Lbuild/lib -idirafter include -endif - -build: build_dir false intcmp scrut str strcmp true - -build_dir: +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 + mkdir -p build/bin build/include build/o # build/lib clean: - rm -rf build/ + rm -rf build/ dist/ -install: build - mkdir -p $(PREFIX)/bin $(PREFIX)/lib - mkdir -p $(PREFIX)/man/man1 $(PREFIX)/man/man3 - cp -f build/lib/*.so $(PREFIX)/lib/ - cp -f build/bin/* $(PREFIX)/bin/ - cp -f docs/*.1 $(PREFIX)/man/man1/ - cp -f docs/*.3 $(PREFIX)/man/man3/ +dist: all + mkdir -p \ + dist/bin \ + dist/man/man1 \ + # dist/$(PREFIX)/lib \ + # dist/$(PREFIX)/man/man3 + cp build/bin/* dist/bin/ + # cp build/lib/* dist/$(PREFIX)/lib/ + cp docs/*.1 dist/man/man1/ + # cp docs/*.3 dist/$(PREFIX)/man/man3/ + +install: dist + mkdir -p $(PREFIX) + cp -r dist/* $(PREFIX)/ test: build tests/cc-compat.sh tests/posix-compat.sh -sysexits: build_dir +sysexits: 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 \ + bindgen --default-macro-constant-type signed --use-core --formatter=none \ "$$(printf '#include \n' \ | cpp -M -idirafter "build/include" - \ | sed 's/ /\n/g' | grep sysexits.h)" \ | $(RUSTC) $(RUSTCFLAGS) --crate-type lib -o build/o/libsysexits.rlib - -false: src/false.rs build_dir +false: src/false.rs build $(RUSTC) $(RUSTCFLAGS) -o build/bin/false src/false.rs -fop: src/fop.rs build_dir sysexits +fop: src/fop.rs build sysexits $(RUSTC) $(RUSTCFLAGS) -o build/bin/fop src/fop.rs -intcmp: src/intcmp.c build_dir +intcmp: src/intcmp.c build $(CC) $(CFLAGS) -o build/bin/intcmp src/intcmp.c -scrut: src/scrut.c build_dir +scrut: src/scrut.c build $(CC) $(CFLAGS) -o build/bin/scrut src/scrut.c -str: src/str.c build_dir +str: src/str.c build $(CC) $(CFLAGS) -o build/bin/str src/str.c -strcmp: src/strcmp.c build_dir +strcmp: src/strcmp.c build $(CC) $(CFLAGS) -o build/bin/strcmp src/strcmp.c -true: src/true.rs build_dir +true: src/true.rs build $(RUSTC) $(RUSTCFLAGS) -o build/bin/true src/true.rs