]> git.puffer.fish Git - matthieu/nova.git/commitdiff
please just work
authoricecodder <git@icecodder.me>
Sat, 14 Jan 2023 17:34:04 +0000 (18:34 +0100)
committerGitHub <noreply@github.com>
Sat, 14 Jan 2023 17:34:04 +0000 (18:34 +0100)
Makefile

index ccca3c701c5f5a391e6b962000628580fc478158..a2dd621e50a1f4e812d720b1eaf3123dd35e6a38 100644 (file)
--- 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