Skip to content

Commit

Permalink
update rust; update unmake
Browse files Browse the repository at this point in the history
  • Loading branch information
mcandre committed Jan 6, 2024
1 parent edc9ce7 commit b549b20
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
golang 1.21.5
nodejs 20.10.0
python 3.12.1
rust 1.68.2
rust 1.75.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BSD-2-Clause
* [Go](https://go.dev/) 1.21.5+
* [Node.js](https://www.npmjs.com/) 20.10.0+
* [Python](https://www.python.org/) 3.12.1+
* [Rust](https://www.rust-lang.org/en-US/) 1.68.2+
* [Rust](https://www.rust-lang.org/en-US/) 1.75.0+
* [GNU findutils](https://www.gnu.org/software/findutils/)
* [GNU grep](https://www.gnu.org/software/grep/)
* a POSIX compliant [make](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html) implementation (e.g. GNU make, BSD make, etc.)
Expand Down
2 changes: 1 addition & 1 deletion install.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.PHONY: all

all:
cargo install --force unmake@0.0.12
cargo install --force unmake@0.0.14

go install github.com/mcandre/slick/cmd/slick@v0.0.6
go install github.com/mcandre/stank/...@v0.0.24
Expand Down
1 change: 1 addition & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ slick:

unmake:
unmake .
unmake -n .

yamllint:
yamllint -s .yamllint .
34 changes: 15 additions & 19 deletions procedural/asm/gas/riscv64/hello/GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
.PHONY: all lint test clean
.PHONY: \
all \
lint \
test \
unmake \
clean

HOST_ARCH=$(shell uname -m)

Expand All @@ -14,28 +19,19 @@ OBJ=hello.o
all: test

test: $(BIN)
@$(BIN)
$(BIN)

$(BIN): $(OBJ)
@mkdir -p bin
@$(TOOLCHAIN_PREFIX)ld -o $(BIN) $(OBJ)
mkdir -p bin
$(TOOLCHAIN_PREFIX)ld -o $(BIN) $(OBJ)

$(OBJ): hello.s
@$(TOOLCHAIN_PREFIX)as -o $(OBJ) hello.s

checkmake:
@find . \
-type f \
\( \
-iname Makefile -o \
-iname GNUmakefile -o \
-iname '*.mk' -o \
-iname '*.make' \
\) \
-print0 | \
xargs -0 -n 1 checkmake

lint: checkmake
$(TOOLCHAIN_PREFIX)as -o $(OBJ) hello.s

unmake:
unmake .

lint: unmake

clean:
-rm -rf bin
Expand Down
41 changes: 20 additions & 21 deletions procedural/asm/gas/x86/hello/GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
.PHONY: all lint test clean
.POSIX:
.SILENT:
.IGNORE: clean
.PHONY: \
all \
lint \
test \
unmake \
clean

# Linux defaults
BIN=bin/hello
Expand All @@ -7,29 +15,20 @@ OBJ=hello.o
all: test

test: $(BIN)
@$(BIN)
$(BIN)

$(BIN): $(OBJ)
@mkdir -p bin
@ld -o $(BIN) $(OBJ)
mkdir -p bin
ld -o $(BIN) $(OBJ)

$(OBJ): hello.s
@as -o $(OBJ) hello.s

checkmake:
@find . \
-type f \
\( \
-iname Makefile -o \
-iname GNUmakefile -o \
-iname '*.mk' -o \
-iname '*.make' \
\) \
-print0 | \
xargs -0 -n 1 checkmake

lint: checkmake
as -o $(OBJ) hello.s

unmake:
unmake .

lint: unmake

clean:
-rm -rf bin
-rm $(OBJ)
rm -rf bin
rm $(OBJ)
2 changes: 1 addition & 1 deletion rtl/systemverilog/fulladder_chain/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARTIFACT=obj_dir/Vfulladder_chain

all: test

$(ARTIFACT): Makefile main.cpp fulladder_chain.sv fulladder.sv
$(ARTIFACT): main.cpp fulladder_chain.sv fulladder.sv
verilator \
-Wall \
-Wno-UNOPTFLat \
Expand Down
18 changes: 8 additions & 10 deletions scripting/shell/unix/tcsh/makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
.POSIX:
.PHONY: all lint funk unmake test clean
.PHONY: \
all \
lint \
funk \
unmake

all: lint

funk:
@funk .
funk .

unmake:
@unmake .
unmake .

lint: funk checkmake

test:
@echo "nothing to do"

clean:
@echo "nothing to do"
lint: funk unmake

0 comments on commit b549b20

Please sign in to comment.