diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-07 08:07:54 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-07 08:07:54 +0000 |
| commit | 6750ea84066ad5f23553d2a8c5e3e61049522df6 (patch) | |
| tree | 481de1ae7f4f7102f19dddb528528b339a1ff250 | |
| parent | 1c48d25c587a32aa029b4bcac78eff552a654876 (diff) | |
| download | ChibiOS-6750ea84066ad5f23553d2a8c5e3e61049522df6.tar.gz ChibiOS-6750ea84066ad5f23553d2a8c5e3e61049522df6.tar.bz2 ChibiOS-6750ea84066ad5f23553d2a8c5e3e61049522df6.zip | |
Fixed bug #653.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8437 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/common/ports/ARM/compilers/GCC/rules.mk | 10 | ||||
| -rw-r--r-- | os/common/ports/ARMCMx/compilers/GCC/rules.mk | 90 |
2 files changed, 51 insertions, 49 deletions
diff --git a/os/common/ports/ARM/compilers/GCC/rules.mk b/os/common/ports/ARM/compilers/GCC/rules.mk index 61f34f224..b8f66a99e 100644 --- a/os/common/ports/ARM/compilers/GCC/rules.mk +++ b/os/common/ports/ARM/compilers/GCC/rules.mk @@ -240,7 +240,7 @@ else @$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif
-%.elf: $(OBJS) $(LDSCRIPT)
+$(BUILDDIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT)
ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo
$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
@@ -249,7 +249,7 @@ else @$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
endif
-%.hex: %.elf $(LDSCRIPT)
+%.hex: %.elf
ifeq ($(USE_VERBOSE_COMPILE),yes)
$(HEX) $< $@
else
@@ -257,7 +257,7 @@ else @$(HEX) $< $@
endif
-%.bin: %.elf $(LDSCRIPT)
+%.bin: %.elf
ifeq ($(USE_VERBOSE_COMPILE),yes)
$(BIN) $< $@
else
@@ -265,7 +265,7 @@ else @$(BIN) $< $@
endif
-%.dmp: %.elf $(LDSCRIPT)
+%.dmp: %.elf
ifeq ($(USE_VERBOSE_COMPILE),yes)
$(OD) $(ODFLAGS) $< > $@
$(SZ) $<
@@ -276,7 +276,7 @@ else @$(SZ) $<
endif
-%.list: %.elf $(LDSCRIPT)
+%.list: %.elf
ifeq ($(USE_VERBOSE_COMPILE),yes)
$(OD) -S $< > $@
else
diff --git a/os/common/ports/ARMCMx/compilers/GCC/rules.mk b/os/common/ports/ARMCMx/compilers/GCC/rules.mk index 7ed2feb95..2434be9cd 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/rules.mk +++ b/os/common/ports/ARMCMx/compilers/GCC/rules.mk @@ -65,13 +65,13 @@ OUTFILES = $(BUILDDIR)/$(PROJECT).elf \ $(BUILDDIR)/$(PROJECT).hex \
$(BUILDDIR)/$(PROJECT).bin \
$(BUILDDIR)/$(PROJECT).dmp \
- $(BUILDDIR)/$(PROJECT).list
-
-ifdef SREC
-OUTFILES += $(BUILDDIR)/$(PROJECT).srec
-endif
-
-# Source files groups and paths
+ $(BUILDDIR)/$(PROJECT).list + +ifdef SREC + OUTFILES += $(BUILDDIR)/$(PROJECT).srec +endif + +# Source files groups and paths ifeq ($(USE_THUMB),yes)
TCSRC += $(CSRC)
TCPPSRC += $(CPPSRC)
@@ -227,57 +227,59 @@ ifeq ($(USE_VERBOSE_COMPILE),yes) $(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
else
@echo Compiling $(<F)
- @$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
-endif
-
-%.elf: $(OBJS) $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
- @echo
- $(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+ @$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ +endif + +$(BUILDDIR)/$(PROJECT).elf: $(OBJS) $(LDSCRIPT) +ifeq ($(USE_VERBOSE_COMPILE),yes) + @echo + $(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ else
@echo Linking $@
- @$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
-endif
-
-%.hex: %.elf $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
- $(HEX) $< $@
-else
+ @$(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ +endif + +%.hex: %.elf +ifeq ($(USE_VERBOSE_COMPILE),yes) + $(HEX) $< $@ +else @echo Creating $@
- @$(HEX) $< $@
-endif
-
-%.bin: %.elf $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
- $(BIN) $< $@
-else
+ @$(HEX) $< $@ +endif + +%.bin: %.elf +ifeq ($(USE_VERBOSE_COMPILE),yes) + $(BIN) $< $@ +else @echo Creating $@
- @$(BIN) $< $@
-endif
-
-%.srec: %.elf $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
+ @$(BIN) $< $@ +endif + +%.srec: %.elf
+ifdef SREC
+ ifeq ($(USE_VERBOSE_COMPILE),yes) $(SREC) $< $@
-else
+ else
@echo Creating $@
@$(SREC) $< $@
+ endif
endif
-%.dmp: %.elf $(LDSCRIPT)
+%.dmp: %.elf
ifeq ($(USE_VERBOSE_COMPILE),yes)
- $(OD) $(ODFLAGS) $< > $@
- $(SZ) $<
+ $(OD) $(ODFLAGS) $< > $@ + $(SZ) $< else
@echo Creating $@
@$(OD) $(ODFLAGS) $< > $@
@echo
- @$(SZ) $<
-endif
-
-%.list: %.elf $(LDSCRIPT)
-ifeq ($(USE_VERBOSE_COMPILE),yes)
- $(OD) -S $< > $@
-else
+ @$(SZ) $< +endif + +%.list: %.elf +ifeq ($(USE_VERBOSE_COMPILE),yes) + $(OD) -S $< > $@ +else @echo Creating $@
@$(OD) -S $< > $@
@echo
|