aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/makefile b/makefile
index ccb2b1a..bea6a2e 100644
--- a/makefile
+++ b/makefile
@@ -7,7 +7,7 @@ include drivers/makefile
AS_OBJ := $(addprefix $(OBJ_DIR)/, $(AS_OBJ))
CXX_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_OBJ))
-CXX_DEP = $(CXX_OBJ:%o=%.d)
+CXX_DEP = $(CXX_OBJ:%.o=%.d)
CXX_TEST_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_TEST_OBJ))
CXX_INCLUDE := $(addprefix -I, $(CXX_INCLUDE))
CXX_SYSTEM_INCLUDE := $(addprefix -isystem, $(CXX_SYSTEM_INCLUDE))
@@ -21,14 +21,14 @@ glitch.elf: $(AS_OBJ) $(CXX_OBJ)
$(AS_OBJ): $(OBJ_DIR)/%.o: %.s
@mkdir -p $(@D)
- @echo " AS $^"
+ @echo " AS $<"
@$(AS) -target $(TARGET) -nostdlib -Wall -Wextra -c $^ -o $@
-include $(CXX_DEP)
$(CXX_OBJ) $(CXX_TEST_OBJ): $(OBJ_DIR)/%.o : %.cc
@mkdir -p $(@D)
- @echo " CXX $^"
- @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(CXX_SYSTEM_INCLUDE) -MMD -c $^ -o $@
+ @echo " CXX $<"
+ @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(CXX_SYSTEM_INCLUDE) -MMD -c $< -o $@
clean:
@rm -rf $(AS_OBJ) $(CXX_OBJ) $(CXX_DEP) $(CXX_TEST_OBJ) glitch.elf isodir