summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlexander Courtis <alex@courtis.org>2020-08-11 11:23:58 +1000
committerAlexander Courtis <alex@courtis.org>2020-08-11 11:23:58 +1000
commite7318f76239133cbbaf6e0b26416ed60e484b485 (patch)
tree05de3d1e89ac8b5097b4a37d4906188de4fff78d /Makefile
parentf593820edee096dc62e296af9d7514cdf4268ce4 (diff)
parente3e9504fcd0b1b38037aa9dffd04ac0de1ce5e82 (diff)
Merge branch 'master' into 24-xwayland-cursor
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7c90456..56ab751 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
-WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
-WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
+include config.mk
-CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function
CFLAGS += -I. -DWLR_USE_UNSTABLE -std=c99 -Werror=declaration-after-statement
+WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
+WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
+
PKGS = wlroots wayland-server xcb xkbcommon
CFLAGS += $(foreach p,$(PKGS),$(shell pkg-config --cflags $(p)))
LDLIBS += $(foreach p,$(PKGS),$(shell pkg-config --libs $(p)))