diff --git a/CMakeLists.txt b/CMakeLists.txt index e583352..063fe46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,3 +109,4 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) install(TARGETS hyprpicker) +install(FILES ${CMAKE_SOURCE_DIR}/doc/hyprpicker.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/Makefile b/Makefile deleted file mode 100644 index 0073c20..0000000 --- a/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -PREFIX = /usr/local -CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement - -CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99 - -WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) -WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) - -PKGS = wlroots wayland-server -CFLAGS += $(foreach p,$(PKGS),$(shell pkg-config --cflags $(p))) -LDLIBS += $(foreach p,$(PKGS),$(shell pkg-config --libs $(p))) - -default: all - -clear: - rm -rf build - rm -f *.o *-protocol.h *-protocol.c - -release: - mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja - cmake --build ./build --config Release --target all -j 10 - -debug: - mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -H./ -B./build -G Ninja - cmake --build ./build --config Debug --target all -j 10 - -all: - make clear - make release - -install: - mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/share/man/man1 - cp doc/hyprpicker.1 ${DESTDIR}${PREFIX}/share/man/man1 - cp build/hyprpicker ${DESTDIR}${PREFIX}/bin diff --git a/README.md b/README.md index c31ebaf..d399d63 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,23 @@ Launch it. Click. That's it. # Building ## Arch + `yay -S hyprpicker-git` ## Manual -`make all` -the output binary is in `./build/hyprpicker` +Building is done via CMake: + +```sh +cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build +cmake --build ./build --config Release --target hyprpicker -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF` +``` + +Install with: + +```sh +cmake --install ./build +``` # Caveats diff --git a/nix/default.nix b/nix/default.nix index 7437dbe..12cb7be 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -61,6 +61,11 @@ stdenv.mkDerivation { utillinux ]; + outputs = [ + "out" + "man" + ]; + meta = with lib; { homepage = "https://github.com/hyprwm/hyprpicker"; description = "A wlroots-compatible Wayland color picker that does not suck";