X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=e184faaf8ffa288ffe1726b3a2f65a0cb9735cad;hb=9ebe3716c147d7d82a09bef8dbde14f771fcb65e;hp=a4a70e4a1958315e1240995822edb46e8b2e9b28;hpb=e1c85639c3dbcfe86a7003bc916efafe629bcbf9;p=deb_pkgs%2Fautorandr.git diff --git a/Makefile b/Makefile index a4a70e4..e184faa 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ DESTDIR=/ PREFIX=/usr/ RPM_SPEC=contrib/packaging/rpm/autorandr.spec -CFLAGS=-O2 +CFLAGS?=-O2 -Wall +CLEANUP_FILES= .PHONY: all install uninstall autorandr bash_completion autostart_config pmutils systemd udev @@ -24,19 +25,23 @@ all: @echo @echo 'E.g. "make install TARGETS='autorandr pmutils' PM_UTILS_DIR=/etc/pm/sleep.d".' @echo - @echo "By default, if xcb libraries are available, autorandr prefers to" - @echo "install a launcher that listens for X11 randr events and runs" - @echo "autorandr whenever something changes, over udev/systemd rules." + @echo "An additional TARGETS variable \"launcher\" is available. This" + @echo "installs a launcher called \"autorandr_launcher\". The launcher" + @echo "is able to be run by the user and calls autorandr automatically" + @echo "without using udev rules. The launcher is an alternative to the" + @echo "udev/systemd setup that is more stable for some users." @echo @echo "The following additional targets are available:" @echo @echo " make deb creates a Debian package" + @echo " make rpm creates a RPM package" # Rules for autorandr itself DEFAULT_TARGETS=autorandr install_autorandr: - install -D -m 755 autorandr.py ${DESTDIR}${PREFIX}/bin/autorandr + mkdir -p ${DESTDIR}${PREFIX}/bin + install -m 755 autorandr.py ${DESTDIR}${PREFIX}/bin/autorandr uninstall_autorandr: rm -f ${DESTDIR}${PREFIX}/bin/autorandr @@ -48,7 +53,8 @@ DEFAULT_TARGETS+=bash_completion endif install_bash_completion: - install -D -m 644 contrib/bash_completion/autorandr ${DESTDIR}/${BASH_COMPLETIONS_DIR}/autorandr + mkdir -p ${DESTDIR}/${BASH_COMPLETIONS_DIR} + install -m 644 contrib/bash_completion/autorandr ${DESTDIR}/${BASH_COMPLETIONS_DIR}/autorandr uninstall_bash_completion: rm -f ${DESTDIR}/${BASH_COMPLETIONS_DIR}/autorandr @@ -58,13 +64,19 @@ XDG_AUTOSTART_DIR=/etc/xdg/autostart DEFAULT_TARGETS+=autostart_config install_autostart_config: - install -D -m 644 contrib/etc/xdg/autostart/autorandr.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop + mkdir -p ${DESTDIR}/${XDG_AUTOSTART_DIR} + install -m 644 contrib/etc/xdg/autostart/autorandr.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop + # KDE-specific autostart (workaround for https://github.com/systemd/systemd/issues/18791) + install -m 644 contrib/etc/xdg/autostart/autorandr.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-kde.desktop + desktop-file-edit --remove-key=X-GNOME-Autostart-Phase --add-only-show-in=KDE ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-kde.desktop + ifneq ($(PREFIX),/usr/) sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop endif uninstall_autostart_config: rm -f ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr.desktop + rm -f ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-kde.desktop # Rules for systemd SYSTEMD_UNIT_DIR:=$(shell pkg-config --variable=systemdsystemunitdir systemd 2>/dev/null) @@ -74,19 +86,23 @@ endif install_systemd: $(if $(SYSTEMD_UNIT_DIR),,$(error SYSTEMD_UNIT_DIR is not defined)) - install -D -m 644 contrib/systemd/autorandr.service ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service + mkdir -p ${DESTDIR}/${SYSTEMD_UNIT_DIR} + install -m 644 contrib/systemd/autorandr.service ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service + install -m 644 contrib/systemd/autorandr-lid-listener.service ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr-lid-listener.service ifneq ($(PREFIX),/usr/) sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service endif @echo - @echo "To activate the systemd unit, run this command as root:" + @echo "To activate the systemd units, run this command as root:" @echo " systemctl daemon-reload" @echo " systemctl enable autorandr.service" + @echo " systemctl enable autorandr-lid-listener.service" @echo uninstall_systemd: $(if $(SYSTEMD_UNIT_DIR),,$(error SYSTEMD_UNIT_DIR is not defined)) rm -f ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr.service + rm -f ${DESTDIR}/${SYSTEMD_UNIT_DIR}/autorandr-lid-listener.service # Rules for pmutils PM_SLEEPHOOKS_DIR:=$(shell pkg-config --variable=pm_sleephooks pm-utils 2>/dev/null) @@ -98,7 +114,8 @@ endif install_pmutils: $(if $(PM_SLEEPHOOKS_DIR),,$(error PM_SLEEPHOOKS_DIR is not defined)) - install -D -m 755 contrib/pm-utils/40autorandr ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr + mkdir -p ${DESTDIR}/${PM_SLEEPHOOKS_DIR} + install -m 755 contrib/pm-utils/40autorandr ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr ifneq ($(PREFIX),/usr/) sed -i -re 's#/usr/bin/autorandr#$(subst #,\#,${PREFIX})/bin/autorandr#g' ${DESTDIR}/${PM_SLEEPHOOKS_DIR}/40autorandr endif @@ -110,14 +127,14 @@ uninstall_pmutils: # Rules for udev UDEV_RULES_DIR:=$(shell pkg-config --variable=udevdir udev 2>/dev/null)/rules.d -ifneq (,$(UDEV_RULES_DIR),y) +ifneq (/rules.d,$(UDEV_RULES_DIR)) DEFAULT_TARGETS+=udev endif install_udev: $(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined)) mkdir -p ${DESTDIR}/${UDEV_RULES_DIR}/ - echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules + echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(MAKECMDGOALS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules @echo @echo "To activate the udev rules, run this command as root:" @echo " udevadm control --reload-rules" @@ -139,20 +156,22 @@ uninstall_manpage: rm -f ${DESTDIR}/${MANDIR}/autorandr.1 # Rules for launcher -LAUNCHER_FLAGS=$(shell pkg-config --libs --cflags pkg-config xcb xcb-randr 2>/dev/null) -ifneq (,$(LAUNCHER_FLAGS)) -DEFAULT_TARGETS+=launcher -DEFAULT_TARGETS:=$(filter-out systemd udev,$(DEFAULT_TARGETS)) -endif - -install_launcher: - gcc -Wall $(CFLAGS) contrib/autorandr_launcher/autorandr_launcher.c -o contrib/autorandr_launcher/autorandr-launcher $(LAUNCHER_FLAGS) - install -D -m 755 contrib/autorandr_launcher/autorandr_launcher ${DESTDIR}${PREFIX}/bin/autorandr-launcher - - install -D -m 644 contrib/etc/xdg/autostart/autorandr-launcher.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-launcher.desktop +LAUNCHER_LDLIBS=$(shell pkg-config --libs pkg-config xcb xcb-randr 2>/dev/null) +ifneq (,$(LAUNCHER_LDLIBS)) +CLEANUP_FILES+=contrib/autorandr_launcher/autorandr-launcher +LAUNCHER_CFLAGS=$(shell pkg-config --cflags pkg-config xcb xcb-randr 2>/dev/null) +contrib/autorandr_launcher/autorandr-launcher: contrib/autorandr_launcher/autorandr_launcher.c + $(CC) $(CFLAGS) $(LAUNCHER_CFLAGS) -o $@ $+ $(LDFLAGS) $(LAUNCHER_LDLIBS) $(LDLIBS) + +install_launcher: contrib/autorandr_launcher/autorandr-launcher + mkdir -p ${DESTDIR}${PREFIX}/bin + install -m 755 contrib/autorandr_launcher/autorandr-launcher ${DESTDIR}${PREFIX}/bin/autorandr-launcher + mkdir -p ${DESTDIR}/${XDG_AUTOSTART_DIR} + install -m 644 contrib/etc/xdg/autostart/autorandr-launcher.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-launcher.desktop ifneq ($(PREFIX),/usr/) sed -i -re 's#/usr/bin/autorandr-launcher#$(subst #,\#,${PREFIX})/bin/autorandr-launcher#g' ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-launcher.desktop endif +endif uninstall_launcher: rm -f ${DESTDIR}${PREFIX}/bin/autorandr-launcher @@ -168,3 +187,6 @@ deb: rpm: spectool -g -R $(RPM_SPEC) rpmbuild -ba $(RPM_SPEC) + +clean: + rm -f $(CLEANUP_FILES)