yosh
/
hikari
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity
hikari/Makefile

271 lines
6.6 KiB
Makefile
Raw Normal View History

Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
.ifmake clean
WITH_ALL = YES
.endif
Add `WITH_ALL` build option Selecting all the options manually can be a bit tedious for packagers and testers. `WITH_ALL` just turns on all the features.
2020-07-30 11:02:25 -05:00
.ifdef WITH_ALL
WITH_XWAYLAND = YES
WITH_SCREENCOPY = YES
WITH_GAMMACONTROL = YES
WITH_LAYERSHELL = YES
WITH_VIRTUAL_INPUT = YES
.endif
use program expansion in Makefile
2020-03-10 08:44:57 -05:00
OS != uname
refactor configuration infrastructure This patch reworks how `hikari` gets configured and provides a default configuration as well as means to incorporate this into the binary. This deprecated the `ETC_PREFIX` configuration during make and makes it reuse `PREFIX`. A default terminal is now specified via the `TERMINAL` environment variable.
2020-05-02 09:34:45 -05:00
VERSION ?= "CURRENT"
streamline default `PREFIX` and related operations We should deal better with leading slashes during compilation.
2020-06-09 04:22:36 -05:00
PREFIX ?= /usr/local
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
PKG_CONFIG ?= pkg-config
reintroduce ETC_PREFIX for Linux builds
2020-05-02 13:52:21 -05:00
ETC_PREFIX ?= ${PREFIX}
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
Let there be light!
2020-02-05 04:02:33 -06:00
OBJS = \
deprecate release bindings for action begin/end Binding actions to the release event for a certain key is not enough for functionality like "push to talk". The release action might get lost when a user releases modifiers first. This patch introduces *begin* and *end* actions. The *begin* action is followed by the *end* action once we release any key or push more keys.
2020-03-22 09:27:56 -05:00
action.o \
improve "actions" and "layouts" parsing "actions" and "layouts" are parsed only when they are being bound which leads to the possibility of having faulty configurations without noticing. We now parse those two sections entirely during startup. This also leads to a simpler cleanup routine for configuration finalization.
2020-02-20 08:16:07 -06:00
action_config.o \
refactor binding configuration code Bindings should get configured when devices are attached. Not when the configuration is loaded. This patch lays the groundwork for more flexible keyboard configuration.
2020-06-23 09:23:15 -05:00
binding_config.o \
binding_group.o \
Let there be light!
2020-02-05 04:02:33 -06:00
border.o \
command.o \
completion.o \
configuration.o \
refactor cursor handling Cursor handling is moved into its own module and normal mode. This adds to readability and removes the need for a couple of checks.
2020-04-30 07:35:18 -05:00
cursor.o \
add support for xdg toplevel decorations The lack of this caused applications like `alacritty` to segfault on startup.
2020-04-06 15:56:35 -05:00
decoration.o \
initial drag and drop support This allows drag and drop support inside of a view. This does not work across views yet.
2020-04-27 11:21:45 -05:00
dnd_mode.o \
Let there be light!
2020-02-05 04:02:33 -06:00
exec.o \
font.o \
geometry.o \
group.o \
group_assign_mode.o \
indicator.o \
indicator_bar.o \
indicator_frame.o \
input_buffer.o \
turn keyboard grab mode into input grab mode This mode is now capable of redirecting all input to its view meaning keyboard and mouse events instead of only keyboard events.
2020-03-12 10:32:10 -05:00
input_grab_mode.o \
Let there be light!
2020-02-05 04:02:33 -06:00
keyboard.o \
add `keyboards` configuration section to `inputs` Allows keyboard configuration on a device basis. Available options are: * `rules` * `model` * `layout` * `variant` * `options` All `xkb` settings are configured in the `xbk` section. Rules can be given as an object and an `xkb` file is specified as a string.
2020-06-26 08:54:30 -05:00
keyboard_config.o \
add layer-shell support This adds layer-shell support to hikari. Outputs now have a usable area instead of just the view geometry. This is used to prevent views from being placed under status bars etc. Support for layer shell is optional and can be compiled in via `WITH_LAYERSHELL=YES`.
2020-04-06 07:19:30 -05:00
layer_shell.o \
Let there be light!
2020-02-05 04:02:33 -06:00
layout.o \
improve "actions" and "layouts" parsing "actions" and "layouts" are parsed only when they are being bound which leads to the possibility of having faulty configurations without noticing. We now parse those two sections entirely during startup. This also leads to a simpler cleanup routine for configuration finalization.
2020-02-20 08:16:07 -06:00
layout_config.o \
add layout select mode Layout bindings are taking up valuable key bindings and since one can have quite a lot of them it is better to move them into registers just like we are already doing with execute registers.
2020-02-24 04:07:20 -06:00
layout_select_mode.o \
add lock mode Introducing `lock` mode. This turns the screen locker into a mode which adds some more modularity to the code. Visible views on sheet 0 are also displayed on the lock screen allowing for a customizable setup without the needs for extra plugins. An indicator adds feedback for typing and verification.
2020-06-09 10:37:41 -05:00
lock_indicator.o \
lock_mode.o \
Let there be light!
2020-02-05 04:02:33 -06:00
main.o \
mark.o \
mark_assign_mode.o \
mark_select_mode.o \
maximized_state.o \
memory.o \
move_mode.o \
normal_mode.o \
output.o \
introduce "outputs" configuration section For future releases we want to be able to configure outputs. This makes the "backgrounds" section redundant, we are merging it with this new section.
2020-02-14 15:20:34 -06:00
output_config.o \
reconfigure pointer devices on configuration reload
2020-02-14 15:20:35 -06:00
pointer.o \
Let there be light!
2020-02-05 04:02:33 -06:00
pointer_config.o \
factor out position configuration Views and outputs can be configured with an explicit position. This can be generalized into a single struct which streamlines the code.
2020-05-05 10:01:57 -05:00
position_config.o \
add `hikari_renderer` Remove `hikari_render_data` in favor of `hikari_renderer`.
2020-06-18 17:00:45 -05:00
renderer.o \
Let there be light!
2020-02-05 04:02:33 -06:00
resize_mode.o \
server.o \
sheet.o \
add sheet assign mode Since it's now possible to move views between sheets this adds a mode where one can manually select the target sheet. On entering the mode a sheet is selected by pressing the number of the target sheet. Tab is used to cycle between target workspaces.
2020-02-21 12:29:48 -06:00
sheet_assign_mode.o \
Let there be light!
2020-02-05 04:02:33 -06:00
split.o \
add switch configuration This patch adds configuration fir switch devices like "lid switches" and "sleep buttons". They are configured like any other input device and bind to an action.
2020-06-30 12:05:16 -05:00
switch.o \
switch_config.o \
Let there be light!
2020-02-05 04:02:33 -06:00
tile.o \
view.o \
rename `view_autconf` to `view_config` Unifies naming with other configuration objects.
2020-06-20 09:20:40 -05:00
view_config.o \
Let there be light!
2020-02-05 04:02:33 -06:00
workspace.o \
Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
xdg_view.o
.ifdef WITH_XWAYLAND
OBJS += \
Let there be light!
2020-02-05 04:02:33 -06:00
xwayland_unmanaged_view.o \
xwayland_view.o
Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
.endif
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
Let there be light!
2020-02-05 04:02:33 -06:00
add command line flags * -h for displaying the help message * -v for version
2020-03-11 07:58:37 -05:00
.PHONY: distclean clean clean-doc doc dist install uninstall
Let there be light!
2020-02-05 04:02:33 -06:00
.PATH: src
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
# Allow specification of /extra/ CFLAGS and LDFLAGS
CFLAGS += ${CFLAGS_EXTRA}
LDFLAGS += ${LDFLAGS_EXTRA}
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
.ifdef DEBUG
adjust debug build for ports
2020-02-06 13:51:38 -06:00
CFLAGS += -g -O0 -fsanitize=address
Let there be light!
2020-02-05 04:02:33 -06:00
.else
CFLAGS += -DNDEBUG
.endif
port to linux Add `Makefile` options to enable building on Linux. And replace `bzero` with `memset`.
2020-02-06 13:59:04 -06:00
.ifdef WITH_POSIX_C_SOURCE
CFLAGS += -D_POSIX_C_SOURCE=200809L
.endif
re-enable XWayland support XWayland support has not been maintained for quite a while so we need to make it work in the new infrastructure. This patch introduces the view method `move_resize` which allows to move and resize a view atomically, this is needed for properly handling XWayland views.
2020-02-07 15:18:23 -06:00
.ifdef WITH_XWAYLAND
CFLAGS += -DHAVE_XWAYLAND=1
.endif
add compile time option for adding gammacontrol This is needed to make tools like `redshift` work. To enable this compile with `WITH_GAMMACONTROL=YES`.
2020-03-07 10:34:27 -06:00
.ifdef WITH_GAMMACONTROL
CFLAGS += -DHAVE_GAMMACONTROL=1
.endif
add `screencopy` as an option You can compile with `hikari` with support for the `wlroots` screencopy protocol by compiling it with `WITH_SCREENCOPY=YES`.
2020-03-07 09:50:24 -06:00
.ifdef WITH_SCREENCOPY
CFLAGS += -DHAVE_SCREENCOPY=1
.endif
add layer-shell support This adds layer-shell support to hikari. Outputs now have a usable area instead of just the view geometry. This is used to prevent views from being placed under status bars etc. Support for layer shell is optional and can be compiled in via `WITH_LAYERSHELL=YES`.
2020-04-06 07:19:30 -05:00
.ifdef WITH_LAYERSHELL
CFLAGS += -DHAVE_LAYERSHELL=1
.endif
Installation without `suid` for `hikari` is now the new default `seatd` and similar mechanisms are present on all relevant platforms.
2020-12-10 04:38:09 -06:00
.ifdef WITH_SUID
add `WITHOUT_SUID` install option Some systems to not require SUID to be set for the `hikari` binary.
2020-05-17 04:31:44 -05:00
PERMS = 4555
Installation without `suid` for `hikari` is now the new default `seatd` and similar mechanisms are present on all relevant platforms.
2020-12-10 04:38:09 -06:00
.else
PERMS = 555
add `WITHOUT_SUID` install option Some systems to not require SUID to be set for the `hikari` binary.
2020-05-17 04:31:44 -05:00
.endif
add virtual keyboard
2020-07-21 13:58:49 -05:00
.ifdef WITH_VIRTUAL_INPUT
CFLAGS += -DHAVE_VIRTUAL_INPUT=1
.endif
streamline default `PREFIX` and related operations We should deal better with leading slashes during compilation.
2020-06-09 04:22:36 -05:00
CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
Let there be light!
2020-02-05 04:02:33 -06:00
WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
Let there be light!
2020-02-05 04:02:33 -06:00
`pkg-config` configuration Submitted by: Aisha It's now possible to configure which `pkg-config` binary should be used.
2020-12-09 11:35:39 -06:00
UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
UCL_LIBS != ${PKG_CONFIG} --libs libucl
Let there be light!
2020-02-05 04:02:33 -06:00
CFLAGS += \
${WLROOTS_CFLAGS} \
${PANGO_CFLAGS} \
${CAIRO_CFLAGS} \
${PIXMAN_CFLAGS} \
${XKBCOMMON_CFLAGS} \
${WAYLAND_CFLAGS} \
${LIBINPUT_CFLAGS} \
${UCL_CFLAGS}
LIBS = \
${WLROOTS_LIBS} \
${PANGO_LIBS} \
${CAIRO_LIBS} \
${PIXMAN_LIBS} \
${XKBCOMMON_LIBS} \
${WAYLAND_LIBS} \
${LIBINPUT_LIBS} \
${UCL_LIBS}
Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
PROTOCOL_HEADERS = xdg-shell-protocol.h
.ifdef WITH_LAYERSHELL
PROTOCOL_HEADERS += wlr-layer-shell-unstable-v1-protocol.h
.endif
Let there be light!
2020-02-05 04:02:33 -06:00
all: hikari hikari-unlocker
add command line flags * -h for displaying the help message * -v for version
2020-03-11 07:58:37 -05:00
version.h:
echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
hikari: version.h ${PROTOCOL_HEADERS} ${OBJS}
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
Let there be light!
2020-02-05 04:02:33 -06:00
xdg-shell-protocol.h:
wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
add layer-shell support This adds layer-shell support to hikari. Outputs now have a usable area instead of just the view geometry. This is used to prevent views from being placed under status bars etc. Support for layer shell is optional and can be compiled in via `WITH_LAYERSHELL=YES`.
2020-04-06 07:19:30 -05:00
wlr-layer-shell-unstable-v1-protocol.h:
wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
Let there be light!
2020-02-05 04:02:33 -06:00
hikari-unlocker: hikari_unlocker.c
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
Let there be light!
2020-02-05 04:02:33 -06:00
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
clean-doc:
ignore error on cleaning manpage from tarball dist
2020-03-06 02:42:08 -06:00
@test -e _darcs && echo "cleaning manpage" ||:
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
@test -e _darcs && rm share/man/man1/hikari.1 2> /dev/null ||:
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
clean: clean-doc
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
@echo "cleaning headers"
Clean up Makefile Prevents from generating header files that are not used for a specific build as well as excluding unnecessary object files. The `clean` target automatically assumes all features being enabled to clean up all potential files.
2020-07-30 11:35:26 -05:00
@test -e _darcs && rm version.h 2> /dev/null ||:
@rm ${PROTOCOL_HEADERS} 2> /dev/null ||:
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
@echo "cleaning object files"
@rm ${OBJS} 2> /dev/null ||:
@echo "cleaning executables"
@rm hikari 2> /dev/null ||:
@rm hikari-unlocker 2> /dev/null ||:
Let there be light!
2020-02-05 04:02:33 -06:00
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
share/man/man1/hikari.1:
use program expansion in Makefile
2020-03-10 08:44:57 -05:00
pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
simplify man page title upate This works via setting the title as a command line argument to pandoc and does not require `sed` hackery.
2020-03-09 13:21:12 -05:00
--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
doc: share/man/man1/hikari.1
add command line flags * -h for displaying the help message * -v for version
2020-03-11 07:58:37 -05:00
hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
@darcs revert
@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
add command line flags * -h for displaying the help message * -v for version
2020-03-11 07:58:37 -05:00
version.h \
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
main.c \
hikari_unlocker.c \
include/hikari/*.h \
src/*.c \
add layer-shell support This adds layer-shell support to hikari. Outputs now have a usable area instead of just the view geometry. This is used to prevent views from being placed under status bars etc. Support for layer shell is optional and can be compiled in via `WITH_LAYERSHELL=YES`.
2020-04-06 07:19:30 -05:00
protocol/*.xml \
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
Makefile \
LICENSE \
README.md \
Add CoC to repository The CoC is still based on the Geekfeminism Code of Conduct, but now it is self hosted with the community name adjusted.
2020-08-21 08:23:53 -05:00
CoC.md \
add CHANGELOG.md to dist tarball
2020-05-14 10:39:09 -05:00
CHANGELOG.md \
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
share/man/man1/hikari.md \
share/man/man1/hikari.1 \
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
share/backgrounds/hikari/hikari_wallpaper.png \
add hikari.desktop session file to distribution tarball
2020-05-25 03:54:32 -05:00
share/wayland-sessions/hikari.desktop \
refactor configuration infrastructure This patch reworks how `hikari` gets configured and provides a default configuration as well as means to incorporate this into the binary. This deprecated the `ETC_PREFIX` configuration during make and makes it reuse `PREFIX`. A default terminal is now specified via the `TERMINAL` environment variable.
2020-05-02 09:34:45 -05:00
etc/hikari/hikari.conf \
etc/pam.d/hikari-unlocker.*
clean up Makefile * remove `debug` build target and replace it with DEBUG variable * add `dist` target for building release packages * add `doc` target to build documentation
2020-03-05 10:55:27 -06:00
add command line flags * -h for displaying the help message * -v for version
2020-03-11 07:58:37 -05:00
distclean: clean-doc
@test -e _darcs && echo "cleaning version.h" ||:
@test -e _darcs && rm version.h ||:
dist: distclean hikari-${VERSION}.tar.gz
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
install: hikari hikari-unlocker share/man/man1/hikari.1
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
mkdir -p ${DESTDIR}/${PREFIX}/bin
mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
Add wayland-session desktop file for use by display managers
2020-05-24 03:13:02 -05:00
mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
streamline default `PREFIX` and related operations We should deal better with leading slashes during compilation.
2020-06-09 04:22:36 -05:00
sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
add `WITHOUT_SUID` install option Some systems to not require SUID to be set for the `hikari` binary.
2020-05-17 04:31:44 -05:00
install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
Add wayland-session desktop file for use by display managers
2020-05-24 03:13:02 -05:00
install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
automate install and uninstall in `Makefile`
2020-03-10 08:34:14 -05:00
uninstall:
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
-rm ${DESTDIR}/${PREFIX}/bin/hikari
-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
remove `hikari.desktop` on `uninstall`
2020-06-09 04:22:08 -05:00
-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
Makefile changes to support more general builds Pull ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} from the environment, which allows the user to specify additional CFLAGS and LDFLAGS that will be added to the respective CFLAGS and LDFLAGS variables built up by the Makefile. (Setting CFLAGS or LDFLAGS directly on the command line, at least with NetBSD make, would cause make to ignore all of the appends in the Makefile.) Add ${CFLAGS_EXTRA} and ${LDFLAGS_EXTRA} to the hikari-unlocker build command, so those flags apply when building that target (this is important in Void cross-compilation, because PAM libs and headers will not generally be in /usr/lib or /usr/include and require specification). Reorder the command-line arguments when building the hikari and hikari-unlocker targets. Some compilers, like GCC, do not properly find symbols from libraries unless the libraries are listed after the source files that reference them. Libraries should always be listed last. Add a ${DESTDIR} prefix to all install destinations, empty by default, to allow installation into a chroot environment. Drop the INSTALL_GROUP and associated -g flag to the install commands. Setting a group explicitly is probably not useful, and can either cause breakage or require manual specification for reasonable behavior. (In Void packaging environments, for example, packages are built as an unprivileged user and the default behavior of grabbing the user's primary group is not correct.) Files are executable or readable by all users anyway and writable only by the owne
2020-05-06 09:38:26 -05:00
-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
add default wallpaper This adds a default wallpaper to `hikari` and uses default output configuration to make use of it. The path to the wallpaper is spliced into the default configuration view `sed` during installation.
2020-05-16 02:56:29 -05:00
-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari