commit 8211d20326874dd96303bd331c58ba3ad4d6e54d parent 8787bec80f9ed5479e43e0723e8a821e98e1004c Author: Bastien Dejean <nihilhill@gmail.com> Date: Fri, 13 Jan 2017 14:14:29 +0100 Move source files to src/ Diffstat:
| M | Makefile | | | 28 | ++++++++++++++-------------- |
| M | Sourcedeps | | | 5 | +++++ |
| R | grab.c -> src/grab.c | | | 0 | |
| R | grab.h -> src/grab.h | | | 0 | |
| R | helpers.c -> src/helpers.c | | | 0 | |
| R | helpers.h -> src/helpers.h | | | 0 | |
| R | locales.h -> src/locales.h | | | 0 | |
| R | parse.c -> src/parse.c | | | 0 | |
| R | parse.h -> src/parse.h | | | 0 | |
| R | sxhkd.c -> src/sxhkd.c | | | 0 | |
| R | sxhkd.h -> src/sxhkd.h | | | 0 | |
| R | types.c -> src/types.c | | | 0 | |
| R | types.h -> src/types.h | | | 0 |
13 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile @@ -1,4 +1,4 @@ -NAME = sxhkd +OUT = sxhkd VERCMD ?= git describe 2> /dev/null VERSION := $(shell $(VERCMD) || cat VERSION) @@ -9,40 +9,40 @@ LDLIBS = -lxcb -lxcb-keysyms PREFIX ?= /usr/local BINPREFIX ?= $(PREFIX)/bin MANPREFIX ?= $(PREFIX)/share/man -DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME) +DOCPREFIX ?= $(PREFIX)/share/doc/$(OUT) -SRC := $(wildcard *.c) -OBJ := $(SRC:.c=.o) - -all: $(NAME) +all: $(OUT) debug: CFLAGS += -O0 -g debug: CPPFLAGS += -DDEBUG -debug: $(NAME) +debug: $(OUT) + +VPATH = src +OBJ = include Sourcedeps $(OBJ): Makefile -$(NAME): $(OBJ) +$(OUT): $(OBJ) install: mkdir -p "$(DESTDIR)$(BINPREFIX)" - cp -pf $(NAME) "$(DESTDIR)$(BINPREFIX)" + cp -pf $(OUT) "$(DESTDIR)$(BINPREFIX)" mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1 - cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1 + cp -p doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1 mkdir -p "$(DESTDIR)$(DOCPREFIX)" cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples uninstall: - rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME) - rm -f "$(DESTDIR)$(MANPREFIX)"/man1/$(NAME).1 + rm -f "$(DESTDIR)$(BINPREFIX)"/$(OUT) + rm -f "$(DESTDIR)$(MANPREFIX)"/man1/$(OUT).1 rm -rf "$(DESTDIR)$(DOCPREFIX)" doc: - a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/$(NAME).1.asciidoc + a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/$(OUT).1.asciidoc clean: - rm -f $(OBJ) $(NAME) + rm -f $(OBJ) $(OUT) .PHONY: all debug install uninstall doc clean diff --git a/Sourcedeps b/Sourcedeps @@ -1,5 +1,10 @@ grab.o: grab.c grab.h helpers.h parse.h sxhkd.h types.h +OBJ += grab.o helpers.o: helpers.c helpers.h sxhkd.h types.h +OBJ += helpers.o parse.o: parse.c helpers.h locales.h parse.h sxhkd.h types.h +OBJ += parse.o sxhkd.o: sxhkd.c grab.h helpers.h parse.h sxhkd.h types.h +OBJ += sxhkd.o types.o: types.c grab.h helpers.h parse.h sxhkd.h types.h +OBJ += types.o diff --git a/grab.c b/src/grab.c diff --git a/grab.h b/src/grab.h diff --git a/helpers.c b/src/helpers.c diff --git a/helpers.h b/src/helpers.h diff --git a/locales.h b/src/locales.h diff --git a/parse.c b/src/parse.c diff --git a/parse.h b/src/parse.h diff --git a/sxhkd.c b/src/sxhkd.c diff --git a/sxhkd.h b/src/sxhkd.h diff --git a/types.c b/src/types.c diff --git a/types.h b/src/types.h