diff -Naur a/Cargo.toml b/Cargo.toml --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] -members = ["asusctl", "asusd", "asusd-user", "config-traits", "cpuctl", "dmi-id", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center", "simulators"] -default-members = ["asusctl", "asusd", "asusd-user", "cpuctl", "rog-control-center"] +members = ["asusctl", "asusd", "asusd-user", "config-traits", "cpuctl", "dmi-id", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "simulators"] +default-members = ["asusctl", "asusd", "asusd-user", "cpuctl"] resolver = "2" [workspace.package] @@ -8,7 +8,7 @@ rust-version = "1.75" [workspace.dependencies] -tokio = { version = "^1.23.0", default-features = false, features = ["macros", "sync"]} +tokio = { version = "^1.23.0", default-features = false, features = ["macros", "sync", "rt", "time", "rt-multi-thread"]} concat-idents = "^1.1" dirs = "^4.0" smol = "^1.3" diff -Naur a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ libdir = $(exec_prefix)/lib zshcpl = $(datarootdir)/zsh/site-functions -BIN_ROG := rog-control-center BIN_C := asusctl BIN_D := asusd BIN_U := asusd-user @@ -44,15 +43,11 @@ rm -rf .cargo vendor vendor.tar.xz install-program: - $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)" - $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)" $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)" $(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)" install-data: - $(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).desktop" "$(DESTDIR)$(datarootdir)/applications/$(BIN_ROG).desktop" - $(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/$(BIN_ROG).png" cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/rog-gui/layouts/{}" \; $(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules" @@ -81,10 +76,6 @@ install: install-program install-data uninstall: - rm -f "$(DESTDIR)$(bindir)/$(BIN_ROG)" - rm -r "$(DESTDIR)$(datarootdir)/applications/$(BIN_ROG).desktop" - rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/$(BIN_ROG).png" - rm -f "$(DESTDIR)$(bindir)/$(BIN_C)" rm -f "$(DESTDIR)$(bindir)/$(BIN_D)" rm -f "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules" @@ -142,7 +133,6 @@ strip -s ./target/$(TARGET)/$(BIN_C) strip -s ./target/$(TARGET)/$(BIN_D) strip -s ./target/$(TARGET)/$(BIN_U) - strip -s ./target/$(TARGET)/$(BIN_ROG) endif