X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Makefile;h=d0f0d9f5d2ab13dc771eb77bf59174b961ef9c54;hb=99974912c87f3a7a6eaf34273c69f509fb54406a;hp=99a28f76cc4574956e5154d99f9e102ff747f70f;hpb=ee633beda86d63e8fcadfe522b0660db7c4f7fe8;p=bspwm.git

diff --git a/Makefile b/Makefile
index 99a28f7..d0f0d9f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,80 @@
-VERSION = 0.4
+VERSION = 0.9
 
-CC      = gcc
-LIBS    = -lm -lxcb -lxcb-icccm -lxcb-ewmh -lxcb-xinerama
-CFLAGS  = -std=c99 -pedantic -Wall -Wextra -D_POSIX_C_SOURCE=2 -DVERSION=\"$(VERSION)\"
-LDFLAGS = $(LIBS)
+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
+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
 
-WM_SRC = bspwm.c events.c messages.c ewmh.c settings.c helpers.c tree.c types.c rules.c window.c
-CL_SRC = bspc.c helpers.c
+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
-all: options bspwm bspc
+all: bspwm bspc
 
 debug: CFLAGS += -O0 -g -DDEBUG
-debug: options bspwm bspc
+debug: bspwm bspc
 
-options:
-	@echo "bspwm build options:"
-	@echo "CC      = $(CC)"
-	@echo "CFLAGS  = $(CFLAGS)"
-	@echo "LDFLAGS = $(LDFLAGS)"
-	@echo "PREFIX  = $(PREFIX)"
+include Sourcedeps
+
+$(WM_OBJ) $(CL_OBJ): Makefile
 
 .c.o:
-	@echo "CC $<"
-	@$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(OPTFLAGS) -c -o $@ $<
 
 bspwm: $(WM_OBJ)
-	@echo CC -o $@
-	@$(CC) -o $@ $(WM_OBJ) $(LDFLAGS)
+	$(CC) -o $@ $(WM_OBJ) $(LDFLAGS) $(LIBS)
 
 bspc: $(CL_OBJ)
-	@echo CC -o $@
-	@$(CC) -o $@ $(CL_OBJ) $(LDFLAGS)
-
-clean:
-	@echo "cleaning"
-	@rm -f $(WM_OBJ) $(CL_OBJ) bsp{wm,c}
+	$(CC) -o $@ $(CL_OBJ) $(LDFLAGS) $(LIBS)
 
 install:
-	@echo "installing executable files to $(DESTDIR)$(BINPREFIX)"
-	@install -D -m 755 bspwm $(DESTDIR)$(BINPREFIX)/bspwm
-	@install -D -m 755 bspc $(DESTDIR)$(BINPREFIX)/bspc
-	@echo "installing manual page to $(DESTDIR)$(MANPREFIX)/man1"
-	@install -D -m 644 bspwm.1 $(DESTDIR)$(MANPREFIX)/man1/bspwm.1
+	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
+	mkdir -p "$(DESTDIR)$(BASHCPL)"
+	cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
+	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)$(XSESSIONS)"
+	cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
 
 uninstall:
-	@echo "removing executable files from $(DESTDIR)$(BINPREFIX)"
-	@rm -f $(DESTDIR)$(BINPREFIX)/bsp{wm,c}
-	@echo "removing manual page from $(DESTDIR)$(MANPREFIX)/man1"
-	@rm -f $(DESTDIR)$(MANPREFIX)/man1/bspwm.1
+	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)$(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
+
+clean:
+	rm -f $(WM_OBJ) $(CL_OBJ) bspwm bspc
 
-.PHONY: all debug options clean install uninstall
+.PHONY: all debug install uninstall doc deps clean