bspwm: port rounded corners patch to latest version

[bspwm.git] / Makefile

diff --git a/Makefile b/Makefile
index 32406585a4d9aa6ab70fbbdcdb98a610c7f73695..9cbedc22062a73bce5eb1f6e6959cadc1aaf975b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,80 +1,78 @@
-VERSION = 0.8.9
-
-CC      ?= gcc
-LIBS     = -lm -lxcb -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
-CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(PREFIX)/include
-CFLAGS  += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-LDFLAGS += -L$(PREFIX)/lib
-
-PREFIX   ?= /usr/local
-BINPREFIX = $(PREFIX)/bin
-MANPREFIX = $(PREFIX)/share/man
-BASHCPL = $(PREFIX)/share/bash-completion/completions
-ZSHCPL = $(PREFIX)/share/zsh/site-functions
-DOCPREFIX = $(PREFIX)/share/doc/bspwm
-
-MD_DOCS = doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
-XSESSIONS = $(PREFIX)/share/xsessions
-
-WM_SRC = bspwm.c helpers.c settings.c monitor.c desktop.c tree.c stack.c history.c \
-        events.c pointer.c window.c messages.c query.c restore.c rule.c ewmh.c subscribe.c
-WM_OBJ = $(WM_SRC:.c=.o)
-CL_SRC = bspc.c helpers.c
-CL_OBJ = $(CL_SRC:.c=.o)
-
-all: CFLAGS += -Os
-all: LDFLAGS += -s
+VERCMD  ?= git describe --tags 2> /dev/null
+VERSION := $(shell $(VERCMD) || cat VERSION)
+
+CPPFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
+CFLAGS   += -std=c99 -pedantic -Wall -Wextra -DJSMN_STRICT
+LDFLAGS  ?=
+LDLIBS    = $(LDFLAGS) -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama -lxcb-shape
+
+PREFIX    ?= /usr/local
+BINPREFIX ?= $(PREFIX)/bin
+MANPREFIX ?= $(PREFIX)/share/man
+DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
+BASHCPL   ?= $(PREFIX)/share/bash-completion/completions
+FISHCPL   ?= $(PREFIX)/share/fish/vendor_completions.d
+ZSHCPL    ?= $(PREFIX)/share/zsh/site-functions
+
+MD_DOCS    = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
+XSESSIONS ?= $(PREFIX)/share/xsessions
+
+WM_SRC   = bspwm.c helpers.c geometry.c jsmn.c settings.c monitor.c desktop.c tree.c stack.c history.c \
+        events.c pointer.c window.c messages.c parse.c query.c restore.c rule.c ewmh.c subscribe.c
+WM_OBJ  := $(WM_SRC:.c=.o)
+CLI_SRC  = bspc.c helpers.c
+CLI_OBJ := $(CLI_SRC:.c=.o)
+
 all: bspwm bspc
 
-debug: CFLAGS += -O0 -g -DDEBUG
+debug: CFLAGS += -O0 -g
 debug: bspwm bspc
 
-include Sourcedeps
+VPATH=src
 
-$(WM_OBJ) $(CL_OBJ): Makefile
+include Sourcedeps
 
-.c.o:
-       $(CC) $(CFLAGS) $(OPTFLAGS) -c -o $@ $<
+$(WM_OBJ) $(CLI_OBJ): Makefile
 
 bspwm: $(WM_OBJ)
-       $(CC) -o $@ $(WM_OBJ) $(LDFLAGS) $(LIBS)
 
-bspc: $(CL_OBJ)
-       $(CC) -o $@ $(CL_OBJ) $(LDFLAGS) $(LIBS)
+bspc: $(CLI_OBJ)
 
 install:
        mkdir -p "$(DESTDIR)$(BINPREFIX)"
-       cp -p bspwm "$(DESTDIR)$(BINPREFIX)"
-       cp -p bspc "$(DESTDIR)$(BINPREFIX)"
-       cp -p contrib/freedesktop/bspwm-session "$(DESTDIR)$(BINPREFIX)"
+       cp -pf bspwm "$(DESTDIR)$(BINPREFIX)"
+       cp -pf bspc "$(DESTDIR)$(BINPREFIX)"
        mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
        cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
        cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
        mkdir -p "$(DESTDIR)$(BASHCPL)"
        cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
+       mkdir -p "$(DESTDIR)$(FISHCPL)"
+       cp -p contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish
        mkdir -p "$(DESTDIR)$(ZSHCPL)"
        cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
        mkdir -p "$(DESTDIR)$(DOCPREFIX)"
        cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
-       cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
+       mkdir -p "$(DESTDIR)$(DOCPREFIX)"/examples
+       cp -pr examples/* "$(DESTDIR)$(DOCPREFIX)"/examples
        mkdir -p "$(DESTDIR)$(XSESSIONS)"
        cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
 
 uninstall:
        rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm
        rm -f "$(DESTDIR)$(BINPREFIX)"/bspc
-       rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm-session
        rm -f "$(DESTDIR)$(MANPREFIX)"/man1/bspwm.1
        rm -f "$(DESTDIR)$(MANPREFIX)"/man1/bspc.1
        rm -f "$(DESTDIR)$(BASHCPL)"/bspc
+       rm -f "$(DESTDIR)$(FISHCPL)"/bspc.fish
        rm -f "$(DESTDIR)$(ZSHCPL)"/_bspc
        rm -rf "$(DESTDIR)$(DOCPREFIX)"
        rm -f "$(DESTDIR)$(XSESSIONS)"/bspwm.desktop
 
 doc:
-       a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/bspwm.1.txt
+       a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/bspwm.1.asciidoc
 
 clean:
-       rm -f $(WM_OBJ) $(CL_OBJ) bspwm bspc
+       rm -f $(WM_OBJ) $(CLI_OBJ) bspwm bspc
 
-.PHONY: all debug install uninstall doc deps clean
+.PHONY: all debug install uninstall doc clean