diff options
| -rw-r--r-- | tmk_core/rules.mk | 58 | 
1 files changed, 28 insertions, 30 deletions
| diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 8cae22b38f..79a7282456 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -43,7 +43,7 @@  # make flip-ee = Download the eeprom file to the device, using Atmel FLIP  #                (must have Atmel FLIP installed).  # -# make debug = Start either simulavr or avarice as specified for debugging,  +# make debug = Start either simulavr or avarice as specified for debugging,  #              with avr-gdb or avr-insight as the front end for debugging.  #  # make filename.s = Just compile filename.c into the assembler code only. @@ -66,7 +66,7 @@ BUILD_DIR = .build  OBJDIR = $(BUILD_DIR)/obj_$(TARGET) -# Optimization level, can be [0, 1, 2, 3, s].  +# Optimization level, can be [0, 1, 2, 3, s].  #     0 = turn off optimization. s = optimize for size.  #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)  OPT = s @@ -161,10 +161,8 @@ CFLAGS += -fshort-enums  CFLAGS += -fno-strict-aliasing  # add color  ifeq ($(COLOR),true) -ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "") +ifeq ("$(echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")  	CFLAGS+= -fdiagnostics-color -else ifeq ("$(shell echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "") -	CFLAGS+= -fcolor-diagnostics  endif  endif  CFLAGS += -Wall @@ -223,7 +221,7 @@ endif  #             for use in COFF files, additional information about filenames  #             and function names needs to be present in the assembler source  #             files -- see avr-libc docs [FIXME: not yet described there] -#  -listing-cont-lines: Sets the maximum number of continuation lines of hex  +#  -listing-cont-lines: Sets the maximum number of continuation lines of hex  #       dump that will be displayed for a given single line of source input.  ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100  ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) @@ -239,7 +237,7 @@ PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min  PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt  # If this is left blank, then it will use the Standard printf version. -PRINTF_LIB =  +PRINTF_LIB =  #PRINTF_LIB = $(PRINTF_LIB_MIN)  #PRINTF_LIB = $(PRINTF_LIB_FLOAT) @@ -251,7 +249,7 @@ SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min  SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt  # If this is left blank, then it will use the Standard scanf version. -SCANF_LIB =  +SCANF_LIB =  #SCANF_LIB = $(SCANF_LIB_MIN)  #SCANF_LIB = $(SCANF_LIB_FLOAT) @@ -263,7 +261,7 @@ MATH_LIB = -lm  #     Each directory must be seperated by a space.  #     Use forward slashes for directory separators.  #     For a directory that has spaces, enclose it in quotes. -EXTRALIBDIRS =  +EXTRALIBDIRS = @@ -324,7 +322,7 @@ JTAG_DEV = /dev/com1  DEBUG_PORT = 4242  # Debugging host used to communicate between GDB / avarice / simulavr, normally -#     just set to localhost unless doing some sort of crazy debugging when  +#     just set to localhost unless doing some sort of crazy debugging when  #     avarice is running on a different computer.  DEBUG_HOST = localhost @@ -358,7 +356,7 @@ endif  MSG_ERRORS_NONE = Errors: none  MSG_BEGIN = -------- begin --------  MSG_END = --------  end  -------- -MSG_SIZE_BEFORE = Size before:  +MSG_SIZE_BEFORE = Size before:  MSG_SIZE_AFTER = Size after:  MSG_COFF = Converting to AVR COFF:  MSG_EXTENDED_COFF = Converting to AVR Extended COFF: @@ -396,22 +394,22 @@ ALL_CPPFLAGS = -mmcu=$(MCU) -x c++ $(CPPFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)  ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)  # Default target. -all:  -	@$(MAKE) begin  -	@$(MAKE) gccversion  -	@$(MAKE) sizebefore  +all: +	@$(MAKE) begin +	@$(MAKE) gccversion +	@$(MAKE) sizebefore  	@$(MAKE) clean_list # force clean each time -	@$(MAKE) build  -	@$(MAKE) sizeafter  +	@$(MAKE) build +	@$(MAKE) sizeafter  	@$(MAKE) end  # Quick make that doesn't clean -quick:  -	@$(MAKE) begin  -	@$(MAKE) gccversion  -	@$(MAKE) sizebefore  -	@$(MAKE) build  -	@$(MAKE) sizeafter  +quick: +	@$(MAKE) begin +	@$(MAKE) gccversion +	@$(MAKE) sizebefore +	@$(MAKE) build +	@$(MAKE) sizeafter  	@$(MAKE) end  # Change the build target to build a HEX file or a library. @@ -456,12 +454,12 @@ sizeafter:  	# @if [[ $($(SIZE) --target=$(FORMAT) $(TARGET).hex | awk 'NR==2 {print "0x"$5}') -gt 0x200 ]]; then $(SECHO) "File is too big!"; fi  # Display compiler version information. -gccversion :  +gccversion :  	@$(SILENT) || $(CC) --version -# Program the device.   +# Program the device.  program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep  	$(PROGRAM_CMD) @@ -492,7 +490,7 @@ endif  	dfu-programmer $(MCU) erase  	dfu-programmer $(MCU) flash $(KEYMAP_PATH)/compiled.hex  	dfu-programmer $(MCU) reset -	 +  dfu-start:  	dfu-programmer $(MCU) reset  	dfu-programmer $(MCU) start @@ -514,9 +512,9 @@ endif  # Generate avr-gdb config/init file which does the following: -#     define the reset signal, load the target file, connect to target, and set  +#     define the reset signal, load the target file, connect to target, and set  #     a breakpoint at main(). -gdb-config:  +gdb-config:  	@$(REMOVE) $(GDBINIT_FILE)  	@echo define reset >> $(GDBINIT_FILE)  	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE) @@ -618,7 +616,7 @@ $(OBJDIR)/%.o : %.c  $(OBJDIR)/%.o : %.cpp  	@mkdir -p $(@D)  	@$(SILENT) || printf "$(MSG_COMPILING_CPP) $<" | $(AWK_CMD) -	$(CC) -c $(ALL_CPPFLAGS) $< -o $@  +	$(CC) -c $(ALL_CPPFLAGS) $< -o $@  	@$(BUILD_CMD)  # Compile: create assembler files from C source files. @@ -642,7 +640,7 @@ $(OBJDIR)/%.o : %.S  # Create preprocessed source for use in sending a bug report.  %.i : %.c -	$(CC) -E -mmcu=$(MCU) $(CFLAGS) $< -o $@  +	$(CC) -E -mmcu=$(MCU) $(CFLAGS) $< -o $@  # Target: clean project.  clean: begin clean_list end | 
