Skip to content

Commit 8417f3c

Browse files
committed
build: Makefile cleanup
1 parent 9920eac commit 8417f3c

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

Makefile

+9-24
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ endif
2525
RELEASE_DIR:=release
2626
DEBUG_DIR:=debug
2727

28-
INSTALL_LINUX_DIR:=/usr/lib/vmware/rdpvcbridge/
29-
3028
#BACKEND_WINDOWS32_RUST_FLAGS:=--remap-path-prefix ${HOME}=/foo -Ctarget-feature=+crt-static
3129
BACKEND_WINDOWS64_RUST_FLAGS:=--remap-path-prefix ${HOME}=/foo -Ctarget-feature=+crt-static
3230
#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:=
3634
FRONTEND_LINUX64_RELEASE_RUST_FLAGS:=-L $(CITRIX_VCSDK_LINUX64_DIR)/binaries/lib/linux64/retail/
3735
FRONTEND_LINUX64_DEBUG_RUST_FLAGS:=-L $(CITRIX_VCSDK_LINUX64_DIR)/binaries/lib/linux64/debug/
3836

37+
.PHONY: setup
38+
setup:
39+
rustup toolchain add stable nightly
40+
rustup target add --toolchain nightly i686-pc-windows-gnu x86_64-pc-windows-gnu
41+
rustup target add x86_64-unknown-linux-gnu i686-pc-windows-gnu x86_64-pc-windows-gnu
42+
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
43+
3944
.PHONY: release
4045
release: build-release
4146
mkdir -p $(RELEASE_DIR)/frontend/win32
@@ -78,13 +83,6 @@ debug: build-debug
7883
distclean: clean
7984
rm -rf ${RELEASE_DIR} ${DEBUG_DIR}
8085

81-
.PHONY: setup
82-
setup:
83-
rustup toolchain add stable nightly
84-
rustup target add --toolchain nightly i686-pc-windows-gnu x86_64-pc-windows-gnu
85-
rustup target add x86_64-unknown-linux-gnu i686-pc-windows-gnu x86_64-pc-windows-gnu
86-
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
87-
8886
#############
8987

9088
.PHONY: build-release
@@ -107,28 +105,15 @@ build-debug:
107105
cd standalone ; cargo build --features log --target x86_64-pc-windows-gnu
108106
cd standalone ; cargo build --features log --target x86_64-unknown-linux-gnu
109107

108+
#############
109+
110110
.PHONY: clippy
111111
clippy:
112112
cd common ; cargo $@ --features log
113113
cd frontend ; cargo $@
114114
cd backend ; cargo $@ --target x86_64-pc-windows-gnu --features log
115115
cd standalone ; cargo $@ --features log
116116

117-
.PHONY: update
118-
update:
119-
cd common ; cargo $@
120-
cd frontend ; cargo $@
121-
cd backend ; cargo $@
122-
cd standalone ; cargo $@
123-
124-
.PHONY: install-linux-frontend-release
125-
install-linux-frontend-release:
126-
cp frontend/target/x86_64-unknown-linux-gnu/release/lib*.so $(INSTALL_LINUX_DIR)
127-
128-
.PHONY: install-linux-frontend-debug
129-
install-linux-frontend-debug:
130-
cp frontend/target/debug/lib*.so $(INSTALL_LINUX_DIR)
131-
132117
.PHONY: cargo-fmt
133118
cargo-fmt:
134119
cd common ; $@

0 commit comments

Comments
 (0)