From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Mon, 4 May 2020 07:20:25 +0000 (+0200)
Subject: Clean up autorandr-launcher build process
X-Git-Tag: 1.10.1~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=73d7e36a2d2ad3035650ea64a71f7f5c4898b290;hp=8da5b1dc0b5c60a8f293d74a677a7b0a297467d1;p=deb_pkgs%2Fautorandr.git

Clean up autorandr-launcher build process
---

diff --git a/Makefile b/Makefile
index 2ce8f7d..c53510b 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
 
@@ -142,15 +143,20 @@ 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)
-install_launcher:
-	gcc -Wall $(CFLAGS) contrib/autorandr_launcher/autorandr_launcher.c -o contrib/autorandr_launcher/autorandr-launcher $(LAUNCHER_FLAGS)
+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
 	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
 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
@@ -166,3 +172,6 @@ deb:
 rpm:
 	spectool -g -R $(RPM_SPEC)
 	rpmbuild -ba $(RPM_SPEC)
+
+clean:
+	rm -f $(CLEANUP_FILES)