correct dependencies in Makefile
applet/$(TARGET).elf should depend on the cpp file, not on .pde so that the cpp is rebuilt when pde changes. We drop the target applet_files to achieve the correct behaviour. Now 'make upload' does rebuild the hex file as well.
This commit is contained in:
parent
a352585065
commit
591b4fa6d8
1 changed files with 4 additions and 4 deletions
|
|
@ -127,11 +127,11 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Default target.
|
# Default target.
|
||||||
all: applet_files build sizeafter
|
all: build sizeafter
|
||||||
|
|
||||||
build: elf hex
|
build: elf hex
|
||||||
|
|
||||||
applet_files: $(TARGET).pde
|
applet/$(TARGET).cpp: $(TARGET).pde
|
||||||
# Here is the "preprocessing".
|
# Here is the "preprocessing".
|
||||||
# It creates a .cpp file based with the same name as the .pde file.
|
# It creates a .cpp file based with the same name as the .pde file.
|
||||||
# On top of the new .cpp file comes the WProgram.h header.
|
# On top of the new .cpp file comes the WProgram.h header.
|
||||||
|
|
@ -199,7 +199,7 @@ extcoff: $(TARGET).elf
|
||||||
$(NM) -n $< > $@
|
$(NM) -n $< > $@
|
||||||
|
|
||||||
# Link: create ELF output file from library.
|
# Link: create ELF output file from library.
|
||||||
applet/$(TARGET).elf: $(TARGET).pde applet/core.a
|
applet/$(TARGET).elf: applet/core.a applet/$(TARGET).cpp
|
||||||
$(CC) $(ALL_CFLAGS) -Wl,--gc-sections -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
|
$(CC) $(ALL_CFLAGS) -Wl,--gc-sections -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
|
||||||
|
|
||||||
applet/core.a: $(OBJ)
|
applet/core.a: $(OBJ)
|
||||||
|
|
@ -244,4 +244,4 @@ depend:
|
||||||
>> $(MAKEFILE); \
|
>> $(MAKEFILE); \
|
||||||
$(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE)
|
$(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE)
|
||||||
|
|
||||||
.PHONY: all build elf hex eep lss sym program coff extcoff clean depend applet_files sizebefore sizeafter
|
.PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue