mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-22 10:30:13 +00:00
(Hopefully) only style alignment of recent change.
This commit is contained in:
parent
348a52aebe
commit
02fb08e029
@ -121,6 +121,11 @@ $(OBJECTDIR)/%.o: %.c
|
|||||||
$(CC) $(CFLAGS) -c $< -o $@
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifndef CUSTOM_RULE_S_TO_OBJECTDIR_O
|
||||||
|
$(OBJECTDIR)/%.o: %.S
|
||||||
|
$(AS) $(ASFLAGS) $< -o $@
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef CUSTOM_RULE_C_TO_O
|
ifndef CUSTOM_RULE_C_TO_O
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -c $< -o $@
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
@ -131,11 +136,6 @@ ifndef CUSTOM_RULE_C_TO_CO
|
|||||||
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -c $< -o $@
|
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -c $< -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef CUSTOM_RULE_S_TO_OBJECTDIR_O
|
|
||||||
$(OBJECTDIR)/%.o: %.S
|
|
||||||
$(AS) $(ASFLAGS) -o $@ $<
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef AROPTS
|
ifndef AROPTS
|
||||||
AROPTS = rcf
|
AROPTS = rcf
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user