aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlexander Courtis <alex@courtis.org>2020-08-11 11:42:02 +1000
committerAlexander Courtis <alex@courtis.org>2020-08-11 11:42:02 +1000
commit4788baee8db25c797648ca7440a6c821f3f62a9c (patch)
tree5f271facc40221662e5d45a69ef585deb135c783 /Makefile
parent5b464edf91b748a19cba2aa2c472f2d939f15220 (diff)
parente3e9504fcd0b1b38037aa9dffd04ac0de1ce5e82 (diff)
Merge branch 'master' into 31-independents-mouse-focus
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)))