separate build directory for intermediates

diff --git a/.gitignore b/.gitignore
index 0f9ba430b28bb2723bdcf46521747ccd033dab01..efe752e41120b0681157fd411ac836037522a37b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-*.d
-*.o
 *.swp
 *.swo
 blank
+build

diff --git a/Makefile b/Makefile
index 20b02e9a8f2e025aaacba01869174ad369be1a38..0665d5c1cc140b581d568ab396d26f650e58d494 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,22 +19,33 @@ CXXFLAGS += -g3 -O0
 # release
 #CPPFLAGS += -DNDEBUG
 
-SRC = $(wildcard src/*.cpp)
-OBJ = $(SRC:.cpp=.o)
-DEP = $(SRC:.cpp=.d)
+SOURCE_DIR := src
+BUILD_DIR := build
+
+SRC = $(wildcard $(SOURCE_DIR)/*.cpp)
+OBJ = $(patsubst $(SOURCE_DIR)/%.cpp, $(BUILD_DIR)/%.o, $(SRC))
+DEP = $(OBJ:.o=.d)
 BIN = blank
 
 all: $(BIN)
 
 clean:
-       rm -f $(BIN) $(OBJ) $(DEP)
+       rm -df $(OBJ) $(DEP) $(BUILD_DIR)
+
+distclean: clean
+       rm -f $(BIN)
 
-.PHONY: all clean
+.PHONY: all clean distclean
 
 -include $(DEP)
 
 $(BIN): $(OBJ)
-       $(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $^
+       @echo link: $@
+       @$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $^
+
+$(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(BUILD_DIR)
+       @echo compile: $@
+       @$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ -MMD -MP -MF"$(@:.o=.d)" -MT"$@" $<
 
-%.o: %.cpp
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ -MMD -MP -MF"$*".d -MT"$@" $<
+$(BUILD_DIR):
+       mkdir "$@"