diff options
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/root.make b/tools/root.make index 00586379c6..8a923983f9 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -51,8 +51,8 @@ endif | |||
51 | 51 | ||
52 | all: $(DEPFILE) build | 52 | all: $(DEPFILE) build |
53 | 53 | ||
54 | # Subdir makefiles. their primary purpose is to populate SRC & OTHER_SRC | 54 | # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC & |
55 | # but they also define special dependencies and compile rules | 55 | # ASMDEFS_SRC but they also define special dependencies and compile rules |
56 | include $(TOOLSDIR)/tools.make | 56 | include $(TOOLSDIR)/tools.make |
57 | include $(FIRMDIR)/firmware.make | 57 | include $(FIRMDIR)/firmware.make |
58 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 58 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make |
@@ -96,6 +96,7 @@ $(DEPFILE) dep: | |||
96 | @echo foo > /dev/null # there must be a "real" command in the rule | 96 | @echo foo > /dev/null # there must be a "real" command in the rule |
97 | $(call mkdepfile,$(DEPFILE),$(SRC)) | 97 | $(call mkdepfile,$(DEPFILE),$(SRC)) |
98 | $(call mkdepfile,$(DEPFILE),$(OTHER_SRC)) | 98 | $(call mkdepfile,$(DEPFILE),$(OTHER_SRC)) |
99 | $(call mkdepfile,$(DEPFILE),$(ASMDEFS_SRC)) | ||
99 | @mv $(DEPFILE)_ $(DEPFILE) | 100 | @mv $(DEPFILE)_ $(DEPFILE) |
100 | $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) | 101 | $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) |
101 | 102 | ||
@@ -317,6 +318,12 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.S | |||
317 | $(SILENT)mkdir -p $(dir $@) | 318 | $(SILENT)mkdir -p $(dir $@) |
318 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ | 319 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ |
319 | 320 | ||
321 | # generated definitions for use in .S files | ||
322 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | ||
323 | $(call PRINTS,ASMDEFS $(@F)) | ||
324 | $(SILENT)mkdir -p $(dir $@) | ||
325 | $(call asmdefs2file,$<,$@) | ||
326 | |||
320 | # when source and object are both in BUILDDIR (generated code): | 327 | # when source and object are both in BUILDDIR (generated code): |
321 | %.o: %.c | 328 | %.o: %.c |
322 | $(SILENT)mkdir -p $(dir $@) | 329 | $(SILENT)mkdir -p $(dir $@) |