From c4b428f3ed17ba21bb4df7e1094352a75c74d368 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Tue, 11 Feb 2025 00:46:44 +0000 Subject: [PATCH] fix makefiles slightly --- Makefile | 6 +++--- src/Makefile | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9bd4fbe..58e2a82 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ export DIST build: src clean: src - rm -r test/* src: $(MAKE) -C $@ $(MAKECMDGOALS) @@ -12,8 +11,9 @@ src: dev-init: # ubuntu only apt install -y python3 openjdk-21-jre-headless -test: +test: build + mkdir -p test/world/datapacks/ cp dist/* test/world/datapacks/ cd test && java -Xmx1024M -Xms1024M -jar server.jar nogui -.PHONY: all src test \ No newline at end of file +.PHONY: all src dev-init test \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index 96808c1..4bac8fe 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,4 +12,6 @@ clean: rm -f "$(DIST)/$$d.zip" ; \ done -.PHONY: all $(SUBDIRS) \ No newline at end of file +test: build + +.PHONY: all $(SUBDIRS) clean test \ No newline at end of file