From d6f244f7d9f52462bafb608f23494707eeb24751 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 20 Apr 2014 22:57:28 -0400
Subject: clean up the directory structure a bit

---
 Makefile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 141e7dd..866ed58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
 OUT      = runes
-OBJ      = runes.o display.o term.o parser.o config.o window-xlib.o pty-unix.o
+BUILD    = build/
+SRC      = src/
+OBJ      = $(BUILD)runes.o \
+	   $(BUILD)display.o \
+	   $(BUILD)term.o \
+	   $(BUILD)parser.o \
+	   $(BUILD)config.o \
+	   $(BUILD)window-xlib.o \
+	   $(BUILD)pty-unix.o
 LIBS     = cairo cairo-xlib libuv pangocairo
 CFLAGS  ?= -g -Wall -Wextra -Werror
 LDFLAGS ?= -g -Wall -Wextra -Werror
@@ -7,23 +15,25 @@ LDFLAGS ?= -g -Wall -Wextra -Werror
 ALLCFLAGS  = $(shell pkg-config --cflags $(LIBS)) $(CFLAGS)
 ALLLDFLAGS = $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
 
-MAKEDEPEND = $(CC) $(ALLCFLAGS) -M -MP -MT '$@ $(@:%.o=.%.d)'
+MAKEDEPEND = $(CC) $(ALLCFLAGS) -M -MP -MT '$@ $(@:$(BUILD)%.o=$(BUILD).%.d)'
 
 build: $(OUT)
 
 $(OUT): $(OBJ)
 	$(CC) $(ALLLDFLAGS) -o $@ $^
 
-%.o: %.c
-	@$(MAKEDEPEND) -o $(<:%.c=.%.d) $<
+$(BUILD)%.o: $(SRC)%.c
+	@mkdir -p $(BUILD)
+	@$(MAKEDEPEND) -o $(<:$(SRC)%.c=$(BUILD).%.d) $<
 	$(CC) $(ALLCFLAGS) -c -o $@ $<
 
-%.c: %.l
+$(SRC)%.c: $(SRC)%.l
 	$(LEX) -o $@ $<
 
 clean:
-	rm -f $(OUT) $(OBJ) $(OBJ:%.o=.%.d)
+	rm -f $(OUT) $(OBJ) $(OBJ:$(BUILD)%.o=$(BUILD).%.d)
+	@rmdir -p $(BUILD) > /dev/null 2>&1
 
--include $(OBJ:%.o=.%.d)
+-include $(OBJ:$(BUILD)%.o=$(BUILD).%.d)
 
 .PHONY: build clean
-- 
cgit v1.2.3-54-g00ecf