chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0662ef
)
remove annoying @s from Makefile
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2012 15:23:41 +0000
(16:23 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2012 15:23:41 +0000
(16:23 +0100)
Marlin/Makefile
patch
|
blob
|
history
diff --git
a/Marlin/Makefile
b/Marlin/Makefile
index 9aae15135363e2758ef437e7a79a6521cfd7607e..8b3fe46fdde8f4fec8ac7c3d5b3cbecb54598e33 100644
(file)
--- a/
Marlin/Makefile
+++ b/
Marlin/Makefile
@@
-242,7
+242,7
@@
extcoff: $(TARGET).elf
.elf.hex:
@echo " COPY $@"
.elf.hex:
@echo " COPY $@"
-
@
$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+ $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
.elf.eep:
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
.elf.eep:
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
@@
-259,24
+259,24
@@
extcoff: $(TARGET).elf
# Link: create ELF output file from library.
applet/$(TARGET).elf: applet/$(TARGET).cpp applet/core.a Configuration.h
@echo " CXX $@"
# Link: create ELF output file from library.
applet/$(TARGET).elf: applet/$(TARGET).cpp applet/core.a Configuration.h
@echo " CXX $@"
-
@
$(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
+ $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
applet/core.a: $(OBJ)
@for i in $(OBJ); do echo " AR $$i"; $(AR) rcs applet/core.a $$i; done
applet/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
@echo " CC $@"
applet/core.a: $(OBJ)
@for i in $(OBJ); do echo " AR $$i"; $(AR) rcs applet/core.a $$i; done
applet/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
@echo " CC $@"
-
@
$(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
+ $(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
applet/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
@echo " CXX $@"
applet/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
@echo " CXX $@"
-
@
$(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
+ $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
# Target: clean project.
clean:
@echo " RM applet/*"
# Target: clean project.
clean:
@echo " RM applet/*"
-
@
$(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \
+ $(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \
applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/$(TARGET).cpp applet/core.a \
$(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) $(CXXSRC:.cpp=.s) $(CXXSRC:.cpp=.d)
@echo " RMDIR applet/"
applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/$(TARGET).cpp applet/core.a \
$(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) $(CXXSRC:.cpp=.s) $(CXXSRC:.cpp=.d)
@echo " RMDIR applet/"