azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

translator: build fixes

Browse Source
This commit is contained in:
e5l
2016-08-22 10:31:17 +03:00
parent 478337c4c5
commit ca6159269a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
car_cfmw/Makefile
+3 -2
View File
@@ -5,7 +5,7 @@ CAR_FMW_OBJ=$(BIN_DIR)/car_fmw.o
CAR_FMW_ELF=$(BIN_DIR)/car_fmw.elf CAR_FMW_ELF=$(BIN_DIR)/car_fmw.elf
CAR_FMW_BIN=$(BIN_DIR)/car_fmw.bin CAR_FMW_BIN=$(BIN_DIR)/car_fmw.bin
LIB_CARHW_DIR=../car_hw/ LIB_CARHW_DIR=../car_hw
LIB_CARHW_OBJ=$(LIB_CARHW_DIR)/bin/car_hw.o LIB_CARHW_OBJ=$(LIB_CARHW_DIR)/bin/car_hw.o
LIB_CARHW_LIB_DIR=$(LIB_CARHW_DIR)/src/lib/ LIB_CARHW_LIB_DIR=$(LIB_CARHW_DIR)/src/lib/
@@ -44,7 +44,7 @@ CARFMW_OBJ_PREFIX=carfmw_
$(CAR_FMW_BIN): $(CAR_FMW_ELF) $(BIN_DIR) $(CAR_FMW_BIN): $(CAR_FMW_ELF) $(BIN_DIR)
$(OBJ_COPY) -O binary $< $@ $(OBJ_COPY) -O binary $< $@
$(CAR_FMW_ELF): $(CAR_FMW_OBJ) $(LIB_CARHW_OBJ) $(CAR_FMW_ELF): $(LIB_CARHW_OBJ) $(CAR_FMW_OBJ)
$(CC) $(CFLAGS) $^ -T $(SRC_DIR)/stm32_flash.ld -o $@ $(CC) $(CFLAGS) $^ -T $(SRC_DIR)/stm32_flash.ld -o $@
$(CAR_FMW_OBJ): \ $(CAR_FMW_OBJ): \
@@ -63,6 +63,7 @@ $(BIN_DIR):
clean: clean:
rm -rf bin/* rm -rf bin/*
make -C $(LIB_CARHW_DIR) clean
tags: tags:
ctags -R * $(LIB_CARHW_DIR) ctags -R * $(LIB_CARHW_DIR)
car_hw/Makefile
+1 -1
View File
@@ -72,7 +72,7 @@ $(BIN_DIR)/$(CAR_OBJ_PREFIX)%.o: $(SRC_DIR)/%.c \
$(CC_ALL_DEPS) $(CC_ALL_DEPS)
clean: clean:
rm $(BIN_DIR)/* rm -rf $(BIN_DIR)/*
tags: tags:
ctags -R * ctags -R *