diff options
| author | hathach <[email protected]> | 2019-01-25 16:04:06 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-01-25 16:04:06 +0700 |
| commit | cff217fb4737eb87d58b77233f4da1bdfe3ae52d (patch) | |
| tree | 99a6a5a9d23add270b662f237ca05327085dbe02 /examples | |
| parent | bd5325612620209e7964f10817a57f916d3bc13f (diff) | |
| parent | e6224bccf980c931b3f2630d08517627823f326d (diff) | |
Merge branch 'devlocal' into develop
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/cdc_msc_hid/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/device/cdc_msc_hid/Makefile b/examples/device/cdc_msc_hid/Makefile index 11c05ad26..50a57d448 100644 --- a/examples/device/cdc_msc_hid/Makefile +++ b/examples/device/cdc_msc_hid/Makefile @@ -84,8 +84,8 @@ LIB_SOURCE += \ SRC_C += $(LIB_SOURCE) -OBJ = $(addprefix $(BUILD)/obj/, $(SRC_C:.c=.o)) -OBJ += $(addprefix $(BUILD)/obj/, $(SRC_S:.s=.o)) +OBJ += $(addprefix $(BUILD)/obj/, $(SRC_C:.c=.o)) +OBJ += $(addprefix $(BUILD)/obj/, $(SRC_S:.S=.o)) all: $(BUILD)/$(BOARD)-firmware.bin @@ -107,7 +107,7 @@ $(BUILD)/$(BOARD)-firmware.bin: $(BUILD)/$(BOARD)-firmware.elf # to be used to compile all .c files. vpath %.c . $(TOP) $(BUILD)/obj/%.o: %.c - @echo CC $@ + @echo CC $(notdir $@) @$(CC) $(CFLAGS) -c -MD -o $@ $< @# The following fixes the dependency file. @# See http://make.paulandlesley.org/autodep.html for details. @@ -117,5 +117,11 @@ $(BUILD)/obj/%.o: %.c -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \ $(RM) $(@:.o=.d) +# ASM sources +vpath %.S . $(TOP) +$(BUILD)/obj/%.o: %.S + @echo AS $(notdir $@) + @$(CC) -x assembler-with-cpp $(ASFLAGS) -c -o $@ $< + clean: rm -rf build-$(BOARD) |