From: icecodder <git@icecodder.me>
Date: Sat, 14 Jan 2023 17:34:04 +0000 (+0100)
Subject: please just work
X-Git-Tag: v0.1.1~26^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9fe8ba0b29d724a3a5ecc93f8be9ab935b256347;p=matthieu%2Fnova.git

please just work
---

diff --git a/Makefile b/Makefile
index ccca3c7..a2dd621 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,6 @@ build/lib/liball_in_one.a build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe
 	@cp target/release/liball_in_one.a build/lib
 	@cp target/release/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin
 
-build/lib/liball_in_one.a build/bin/{cache,gateway,ratelimit,rest,webhook}: build/{bin,lib}
-	@echo "Building rust project"
-	cargo build --release
-	@cp target/release/liball_in_one.a build/lib
-	@cp target/release/{cache,gateway,ratelimit,rest,webhook} build/bin
-
 # Generated by a rust build script.
 internal/pkg/all-in-one/all-in-one.h: build/lib/liball_in_one.a
 
@@ -22,19 +16,7 @@ internal/pkg/all-in-one/all-in-one.h: build/lib/liball_in_one.a
 build/bin/nova: build/lib/liball_in_one.a internal/pkg/all-in-one/all-in-one.h
 	go build -a -ldflags '-s' -o build/bin/nova cmd/nova/nova.go
 
-all:
-	#SYS := $(shell gcc -dumpmachine)
-	SYS := $(shell uname -s)
-	ifeq ($(SYS),Linux)
-		# Do Linux things
- 		build/bin/{cache,gateway,ratelimit,rest,webhook} build/bin/nova
-	else ifeq ($(SYS),Darwin)
-		# Do Darwin things
-		build/bin/{cache,gateway,ratelimit,rest,webhook} build/bin/nova
-	else
- 		# Do MinGW things
-		build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin/nova
-	endif
+all: build/bin/{cache,gateway,ratelimit,rest,webhook}{,.exe} build/bin/nova
 
 docker-images:
 	docker-compose build