Blinker

@@ -1,2 +1,4 @@

-Blinker

-config.mk

+.*.swp

+/Blinker

+/config.mk

+/obj

@@ -1,5 +1,3 @@

-CFGS := $(wildcard config/*.cfg.sh)

-SRCS := $(wildcard common/*.cpp) $(wildcard linux/*.cpp)

 TARGET := Blinker

 CXX := g++

@@ -10,11 +8,14 @@ CFLAGS := -Wall -Wextra -Werror -O2

 LDFLAGS :=

 LIBS := -lBlinkenLib

+CFGS := $(wildcard config/*.cfg.sh)

 CFGS_BASE := $(patsubst %.cfg.sh,%,$(CFGS))

 CFGS_MK := $(addsuffix .cfg.mk,$(CFGS_BASE))

+

+SRCS := $(wildcard common/*.cpp) $(wildcard linux/*.cpp)

 SRCS_BASE := $(patsubst %.cpp,%,$(SRCS))

-DEPS := $(addsuffix .d,$(SRCS_BASE))

-OBJS := $(addsuffix .o,$(SRCS_BASE))

+DEPS := $(addprefix obj/,$(addsuffix .d,$(SRCS_BASE)))

+OBJS := $(addprefix obj/,$(addsuffix .o,$(SRCS_BASE)))

 .PHONY: all clean distclean

 .SUFFIXES:

@@ -37,17 +38,20 @@ config.mk: $(CFGS_MK)

 %.cfg.mk: %.cfg.sh

 	sh $< >$@

-%.d: %.cpp Makefile config.mk

-	$(CXX) $(DEFINE) $(INCLUDE) $(CFLAGS) -MM -MF $@ -MT $(@:.d=.o) $<

+obj:

+	mkdir $@ $@/common $@/linux

+

+obj/%.d: %.cpp Makefile config.mk | obj

+	$(CXX) $(DEFINE) $(INCLUDE) $(CFLAGS) -MM -MT $(@:.d=.o) -o $@ $<

-%.o: %.cpp Makefile

+obj/%.o: %.cpp Makefile | obj

 	$(CXX) $(DEFINE) $(INCLUDE) $(CFLAGS) -c -o $@ $<

 $(TARGET): $(OBJS)

 	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)

 clean:

-	rm -f $(DEPS) $(OBJS) $(TARGET)

+	rm -f obj $(TARGET)

 distclean: clean

 	rm -f config.mk $(CFGS_MK)

@@ -1,3 +0,0 @@

-*.d

-*.o

-.*.swp

@@ -1,3 +0,0 @@

-*.d

-*.o

-.*.swp