Use proper recursive make invokation

This commit is contained in:
dak664 2010-12-01 15:05:39 +00:00
parent af7b81efdb
commit fe904bab40
2 changed files with 4 additions and 4 deletions

View file

@ -1,9 +1,9 @@
all: all:
make TARGET=avr-ravenusb -f Makefile.ravenusbstick ravenusbstick.elf ${MAKE} TARGET=avr-ravenusb -f Makefile.ravenusbstick ravenusbstick.elf
avr-objcopy -O ihex -R .signature -R .fuse -R .eeprom ravenusbstick.elf ravenusbstick.hex avr-objcopy -O ihex -R .signature -R .fuse -R .eeprom ravenusbstick.elf ravenusbstick.hex
avr-size -C --mcu=at90usb1287 ravenusbstick.elf avr-size -C --mcu=at90usb1287 ravenusbstick.elf
clean: clean:
make -f Makefile.ravenusbstick clean ${MAKE} -f Makefile.ravenusbstick clean
rm -rf obj_avr-ravenusb rm -rf obj_avr-ravenusb
rm symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex rm symbols.c symbols.h ravenusbstick.elf ravenusbstick.hex

View file

@ -5,14 +5,14 @@ else
endif endif
all: all:
make -f Makefile.webserver TARGET=avr-raven webserver6.elf ${MAKE} -f Makefile.webserver TARGET=avr-raven webserver6.elf
#can't just rename, webserver6 may be open in debugger #can't just rename, webserver6 may be open in debugger
@if [ $(OUTFILE) != "webserver6" ]; then cp webserver6.elf $(OUTFILE).elf;fi @if [ $(OUTFILE) != "webserver6" ]; then cp webserver6.elf $(OUTFILE).elf;fi
avr-objcopy -O ihex -R .eeprom -R .fuse -R .signature $(OUTFILE).elf $(OUTFILE).hex avr-objcopy -O ihex -R .eeprom -R .fuse -R .signature $(OUTFILE).elf $(OUTFILE).hex
avr-size -C --mcu=atmega1284p $(OUTFILE).elf avr-size -C --mcu=atmega1284p $(OUTFILE).elf
clean: clean:
make -f Makefile.webserver TARGET=avr-raven clean ${MAKE} -f Makefile.webserver TARGET=avr-raven clean
# Delete httpd-fsdata.c only if your toolchain includes perl # Delete httpd-fsdata.c only if your toolchain includes perl
# rm ../../platform/avr-raven/apps/raven-webserver/httpd-fsdata.c # rm ../../platform/avr-raven/apps/raven-webserver/httpd-fsdata.c
rm symbols.c symbols.h webserver6.elf webserver6.hex rm symbols.c symbols.h webserver6.elf webserver6.hex