Merge remote-tracking branch 'djpohly/main' into wlroots-next

1 files changed, 7 insertions, 4 deletions

diff --git a/config.mk b/config.mk
index 37b4114..4638d5f 100644
--- a/config.mk
+++ b/config.mk
@@ -1,12 +1,15 @@
 _VERSION = 0.3.1
-VERSION = $(shell ./generate-version.sh $(_VERSION))
+VERSION  = `git describe --long --tags --dirty 2>/dev/null || echo $(_VERSION)`
 
 # paths
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
 
-# Default compile flags (overridable by environment)
-CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement
+# 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
-#CFLAGS += -DXWAYLAND
+#XWAYLAND = -DXWAYLAND
+#XLIBS = xcb