X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Makefile;h=41c833834d1fc0eb78b0cdf48f7b4077c13dd1c7;hb=cd079d2c39a17cd9afda215fef01d3fe1921f882;hp=d0f0d9f5d2ab13dc771eb77bf59174b961ef9c54;hpb=b15c3684cead323e777bf86b17be224bd2d37e0b;p=bspwm.git

diff --git a/Makefile b/Makefile
index d0f0d9f..41c8338 100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,43 @@
-VERSION = 0.9
+VERCMD  ?= git describe 2> /dev/null
+VERSION := $(shell $(VERCMD) || cat VERSION)
 
-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
+CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
+CFLAGS   += -std=c99 -pedantic -Wall -Wextra
+LDLIBS    = -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
 
-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
+PREFIX    ?= /usr/local
+BINPREFIX ?= $(PREFIX)/bin
+MANPREFIX ?= $(PREFIX)/share/man
+DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
+BASHCPL   ?= $(PREFIX)/share/bash-completion/completions
+ZSHCPL    ?= $(PREFIX)/share/zsh/site-functions
 
-MD_DOCS = doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
-XSESSIONS = $(PREFIX)/share/xsessions
+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 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)
+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: CFLAGS += -Os
-all: LDFLAGS += -s
 all: bspwm bspc
 
-debug: CFLAGS += -O0 -g -DDEBUG
+debug: CFLAGS += -O0 -g
 debug: bspwm bspc
 
 include Sourcedeps
 
-$(WM_OBJ) $(CL_OBJ): Makefile
-
-.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 -pf bspwm "$(DESTDIR)$(BINPREFIX)"
 	cp -pf bspc "$(DESTDIR)$(BINPREFIX)"
-	cp -p contrib/freedesktop/bspwm-session "$(DESTDIR)$(BINPREFIX)"
 	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
 	cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
 	cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
@@ -63,7 +54,6 @@ install:
 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
@@ -72,9 +62,9 @@ uninstall:
 	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