Update code to compile against XCB util-wm >= 0.3.8

[spectrwm] / linux / Makefile

diff --git a/linux/Makefile b/linux/Makefile
index 2060184597e454873da34898ef046fb98bb53e35..a31b77d8d42b39c822549bd55ca466ba36d677da 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,6 +1,6 @@
-CFLAGS+= -Wall -ggdb -D_GNU_SOURCE -I.
+CFLAGS+= -Wall -g -D_GNU_SOURCE -I.
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-LDADD+= -lX11 -lXrandr -lXtst
+LDADD+= -lX11 -lXrandr -lXtst -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms
 
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
@@ -11,6 +11,11 @@ CC= gcc
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
+BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh)
+ifneq ("${BUILDVERSION}", "")
+CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+endif
+
 all: spectrwm libswmhack.so.$(LVERS)
 
 spectrwm.c:
@@ -40,6 +45,7 @@ install: all
        install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
        install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
        install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
+       ln -sf $(DESTDIR)$(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm
 
 clean:
        rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h