From 8417f3c667e016165ed00249189d38cd008a4aea Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <151835536+af-airbus@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:55:15 +0100 Subject: [PATCH] build: Makefile cleanup --- Makefile | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index e3c366f..a184b3a 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,6 @@ endif RELEASE_DIR:=release DEBUG_DIR:=debug -INSTALL_LINUX_DIR:=/usr/lib/vmware/rdpvcbridge/ - #BACKEND_WINDOWS32_RUST_FLAGS:=--remap-path-prefix ${HOME}=/foo -Ctarget-feature=+crt-static BACKEND_WINDOWS64_RUST_FLAGS:=--remap-path-prefix ${HOME}=/foo -Ctarget-feature=+crt-static #BACKEND_WINDOWS32_BUILD_FLAGS:=-Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort @@ -36,6 +34,13 @@ FRONTEND_WINDOWS64_RUST_FLAGS:= FRONTEND_LINUX64_RELEASE_RUST_FLAGS:=-L $(CITRIX_VCSDK_LINUX64_DIR)/binaries/lib/linux64/retail/ FRONTEND_LINUX64_DEBUG_RUST_FLAGS:=-L $(CITRIX_VCSDK_LINUX64_DIR)/binaries/lib/linux64/debug/ +.PHONY: setup +setup: + rustup toolchain add stable nightly + rustup target add --toolchain nightly i686-pc-windows-gnu x86_64-pc-windows-gnu + rustup target add x86_64-unknown-linux-gnu i686-pc-windows-gnu x86_64-pc-windows-gnu + rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu + .PHONY: release release: build-release mkdir -p $(RELEASE_DIR)/frontend/win32 @@ -78,13 +83,6 @@ debug: build-debug distclean: clean rm -rf ${RELEASE_DIR} ${DEBUG_DIR} -.PHONY: setup -setup: - rustup toolchain add stable nightly - rustup target add --toolchain nightly i686-pc-windows-gnu x86_64-pc-windows-gnu - rustup target add x86_64-unknown-linux-gnu i686-pc-windows-gnu x86_64-pc-windows-gnu - rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - ############# .PHONY: build-release @@ -107,6 +105,8 @@ build-debug: cd standalone ; cargo build --features log --target x86_64-pc-windows-gnu cd standalone ; cargo build --features log --target x86_64-unknown-linux-gnu +############# + .PHONY: clippy clippy: cd common ; cargo $@ --features log @@ -114,21 +114,6 @@ clippy: cd backend ; cargo $@ --target x86_64-pc-windows-gnu --features log cd standalone ; cargo $@ --features log -.PHONY: update -update: - cd common ; cargo $@ - cd frontend ; cargo $@ - cd backend ; cargo $@ - cd standalone ; cargo $@ - -.PHONY: install-linux-frontend-release -install-linux-frontend-release: - cp frontend/target/x86_64-unknown-linux-gnu/release/lib*.so $(INSTALL_LINUX_DIR) - -.PHONY: install-linux-frontend-debug -install-linux-frontend-debug: - cp frontend/target/debug/lib*.so $(INSTALL_LINUX_DIR) - .PHONY: cargo-fmt cargo-fmt: cd common ; $@