From 31106eff64406a004beb18c265a8b6fa0ae4f7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Tue, 20 Sep 2022 23:34:48 -0500 Subject: [PATCH] rework Makefile - allow user to use a different pkg-config binary - restore almost all (and add other ones) warning flags (-Werror is not set) - $(XWAYLAND) is added to our CPPFLAGS - remove useless comments - don't generate idle-protocol.h (not used) --- Makefile | 31 +++++++++++-------------------- config.mk | 5 ++--- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 4afd717..6605796 100644 --- a/Makefile +++ b/Makefile @@ -4,45 +4,38 @@ include config.mk # flags for compiling -DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" - -# Wayland utils -WAYLAND_PROTOCOLS = `pkg-config --variable=pkgdatadir wayland-protocols` -WAYLAND_SCANNER = `pkg-config --variable=wayland_scanner wayland-scanner` +DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XWAYLAND) +DWLDEVCFLAGS = -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused-parameter -Wno-sign-compare -Wshadow -Wunused-macros # CFLAGS / LDFLAGS PKGS = wlroots wayland-server xkbcommon libinput $(XLIBS) -DWLCFLAGS = `pkg-config --cflags $(PKGS)` $(DWLCPPFLAGS) $(CFLAGS) $(XWAYLAND) -LDLIBS = `pkg-config --libs $(PKGS)` $(LIBS) +DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) +LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS) -# build rules +all: dwl +dwl: dwl.o util.o + $(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@ +dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h +util.o: util.c util.h # wayland-scanner is a tool which generates C headers and rigging for Wayland # protocols, which are specified in XML. wlroots requires you to rig these up # to your build system yourself and provide them in the include path. -all: dwl -dwl: dwl.o util.o - $(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@ -dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h idle-protocol.h -util.o: util.c util.h +WAYLAND_SCANNER = `$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner` +WAYLAND_PROTOCOLS = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols` -# wayland scanner rules to generate .h / .c files xdg-shell-protocol.h: $(WAYLAND_SCANNER) server-header \ $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ wlr-layer-shell-unstable-v1-protocol.h: $(WAYLAND_SCANNER) server-header \ protocols/wlr-layer-shell-unstable-v1.xml $@ -idle-protocol.h: - $(WAYLAND_SCANNER) server-header \ - protocols/idle.xml $@ config.h: cp config.def.h $@ clean: rm -f dwl *.o *-protocol.h -# distribution archive dist: clean mkdir -p dwl-$(VERSION) cp -R LICENSE* Makefile README.md client.h config.def.h\ @@ -51,8 +44,6 @@ dist: clean tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION) rm -rf dwl-$(VERSION) -# install rules - install: dwl mkdir -p $(DESTDIR)$(PREFIX)/bin cp -f dwl $(DESTDIR)$(PREFIX)/bin diff --git a/config.mk b/config.mk index 55c7262..091c03a 100644 --- a/config.mk +++ b/config.mk @@ -1,13 +1,12 @@ _VERSION = 0.3.1-dev VERSION = `git describe --long --tags --dirty 2>/dev/null || echo $(_VERSION)` +PKG_CONFIG = pkg-config + # paths PREFIX = /usr/local MANDIR = $(PREFIX)/share/man -# Compile flags that can be used -#CFLAGS = -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement - XWAYLAND = XLIBS = # Uncomment to build XWayland support