Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git
Update sub-project Makefiles to support workspace target directories
cce-client/Makefile | 18 +++++++++++++++---
cce-server/Makefile | 10 +++++++++-
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/cce-client/Makefile b/cce-client/Makefile
index 0e6c952..050d604 100644
--- a/cce-client/Makefile
+++ b/cce-client/Makefile
@@ -5,9 +5,21 @@ build:
install: build
mkdir -p ~/.local/bin
- install -m 755 target/release/cce-client ~/.local/bin/cce-client
- install -m 755 target/release/clearctl ~/.local/bin/clearctl
- install -m 755 target/release/clear-inspector ~/.local/bin/clear-inspector
+ @if [ -f target/release/cce-client ]; then \
+ install -m 755 target/release/cce-client ~/.local/bin/cce-client; \
+ install -m 755 target/release/clearctl ~/.local/bin/clearctl; \
+ install -m 755 target/release/clear-inspector ~/.local/bin/clear-inspector; \
+ elif [ -f ../target/release/cce-client ]; then \
+ install -m 755 ../target/release/cce-client ~/.local/bin/cce-client; \
+ install -m 755 ../target/release/clearctl ~/.local/bin/clearctl; \
+ install -m 755 ../target/release/clear-inspector ~/.local/bin/clear-inspector; \
+ elif [ -f ../../target/release/cce-client ]; then \
+ install -m 755 ../../target/release/cce-client ~/.local/bin/cce-client; \
+ install -m 755 ../../target/release/clearctl ~/.local/bin/clearctl; \
+ install -m 755 ../../target/release/clear-inspector ~/.local/bin/clear-inspector; \
+ else \
+ echo "Error: cce-client binaries not found"; exit 1; \
+ fi
run:
cargo run
diff --git a/cce-server/Makefile b/cce-server/Makefile
index b5b1ede..ef745a2 100644
--- a/cce-server/Makefile
+++ b/cce-server/Makefile
@@ -5,7 +5,15 @@ build:
install: build
mkdir -p ~/.local/bin
- install -m 755 target/release/cce-server ~/.local/bin/cce-server
+ @if [ -f target/release/cce-server ]; then \
+ install -m 755 target/release/cce-server ~/.local/bin/cce-server; \
+ elif [ -f ../target/release/cce-server ]; then \
+ install -m 755 ../target/release/cce-server ~/.local/bin/cce-server; \
+ elif [ -f ../../target/release/cce-server ]; then \
+ install -m 755 ../../target/release/cce-server ~/.local/bin/cce-server; \
+ else \
+ echo "Error: cce-server binary not found"; exit 1; \
+ fi
run:
cargo run