From cf67258cbcbe5eb571bbcadce997b0aa93d90a03 Mon Sep 17 00:00:00 2001 From: Simon Lindholm Date: Sun, 14 Jan 2018 20:37:53 +0100 Subject: [PATCH] Tiny build simplification --- bindings/java/Makefile | 6 +++--- bindings/python/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index c4dea29..618e8a9 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -14,7 +14,7 @@ endif build: .build-marker .build-marker: ../c/include/bc.i $(CARGO_TARGET_DIR)/debug/deps/libbattlecode.a src/bc/bc_wrap.o src/bc/bcJNI.class $(call build_command,gcc -shared -O0 -fPIC src/bc/bc_wrap.o $(CARGO_TARGET_DIR)/debug/deps/libbattlecode.a $(LIBS) -o $(TARGET)) - $(call build_command,touch .build-marker && rm .release-marker 2&>/dev/null || true) + $(call build_command,touch .build-marker && rm -f .release-marker) test: build javac tests/*.java -classpath ./tests:./src @@ -23,7 +23,7 @@ test: build release: .release-marker .release-marker: ../c/include/bc.i $(CARGO_TARGET_DIR)/release/deps/libbattlecode.a src/bc/bc_wrap.o src/bc/bcJNI.class $(call build_command,gcc -shared -O3 -fPIC src/bc/bc_wrap.o $(CARGO_TARGET_DIR)/release/deps/libbattlecode.a $(LIBS) -o $(TARGET)) - $(call build_command,touch .release-marker && rm .build-marker 2&>/dev/null || true) + $(call build_command,touch .release-marker && rm -f .build-marker) src/bc/bc_wrap.o: src/bc/bc_wrap.c $(call build_command,gcc -c -O3 -fPIC src/bc/bc_wrap.c $(JAVAINCLUDE) -I../c/include/ -o src/bc/bc_wrap.o) @@ -40,6 +40,6 @@ clean: -rm -rf src/bc/*.so -rm -rf src/bc/*.o -rm -rf src/bc/bc_wrap.c - -rm .build-marker .release-marker 2&>/dev/null + -rm -f .build-marker .release-marker .PHONY: build test clean diff --git a/bindings/python/Makefile b/bindings/python/Makefile index 7e7d64b..a105b2b 100644 --- a/bindings/python/Makefile +++ b/bindings/python/Makefile @@ -23,6 +23,6 @@ test: build clean: -rm -rf battlecode/*/*.so build - -rm .build-marker .release-marker 2&>/dev/null + -rm -f .build-marker .release-marker .PHONY: build test clean