diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-06-24 15:48:30 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-06-24 15:48:30 +0000 |
| commit | 4aa6db7215951baa13a2186bb2047125ac3649e7 (patch) | |
| tree | 9b3e2907f78953e854dfc28b87b0374c22515f29 /LUFA | |
| parent | d4f725b0c1e2d030d8277c2f6171e9640f7bd7fb (diff) | |
Make sure dependency files are generated for assembly files too in the BUILD build system module. Minor code cleanups.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2371 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Build/lufa.build.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index 4719d7b7..0e1a4501 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -140,12 +140,12 @@ endif # Convert input source filenames into a list of required output object files OBJECT_FILES := $(addsuffix .o, $(basename $(SRC))) ifneq ($(OBJDIR),.) - $(shell mkdir $(OBJDIR) 2>&1 | /dev/null) + $(shell mkdir $(OBJDIR) 2>&1 > /dev/null) VPATH += $(dir $(SRC)) - OBJECT_FILES := $(addprefix $(patsubst %/,%,$(OBJDIR))/, $(notdir $(OBJECT_FILES))) endif +# Create a list of dependency files from the list of object files DEPENDENCY_FILES := $(OBJECT_FILES:%.o=%.d) # Create a list of common flags to pass to the compiler/linker/assembler @@ -237,7 +237,7 @@ $(OBJDIR)/%.o: %.cpp $(MAKEFILE_LIST) $(OBJDIR)/%.o: %.S $(MAKEFILE_LIST) @echo $(MSG_ASSEMBLE_CMD) Assembling \"$(notdir $<)\" - $(CROSS)-gcc -c $(BASE_CC_FLAGS) $(BASE_ASM_FLAGS) $(CC_FLAGS) $(ASM_FLAGS) $< -o $@ + $(CROSS)-gcc -c $(BASE_CC_FLAGS) $(BASE_ASM_FLAGS) $(CC_FLAGS) $(ASM_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@ .PRECIOUS : $(OBJECT_FILES) .SECONDARY : %.a |