wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust Makefile

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-09 10:25:19 +01:00
parent 5c80167610
commit bd99728827
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cube/Makefile
View File

@ -167,6 +167,7 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
# list of objects # list of objects
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
vpath %.c $(sort $(dir $(C_SOURCES))) vpath %.c $(sort $(dir $(C_SOURCES)))
OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
# list of ASM program objects # list of ASM program objects
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES))) vpath %.s $(sort $(dir $(ASM_SOURCES)))
@ -177,8 +178,8 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
$(AS) -c $(CFLAGS) $< -o $@ $(AS) -c $(CFLAGS) $< -o $@
$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) w5500.a Makefile $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
$(CC) $(OBJECTS) w5500.a $(LDFLAGS) -o $@ $(CC) $(OBJECTS) $(LDFLAGS) -o $@
$(SZ) $@ $(SZ) $@
$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR) $(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)

2
cube/ioLibrary_Driver

@ -1 +1 @@
Subproject commit 181cfae6cc499a859364c2171767b3e49ca3109c Subproject commit 1cdb6d2edab0ad200e89126cb9b85abdead1435c

1
tools/insertMyCode.sh
View File

@ -72,6 +72,7 @@ done
cp $MAKEFILE $MAKEFILE_BAK cp $MAKEFILE $MAKEFILE_BAK
echo "# $PROCESSED" > $MAKEFILE echo "# $PROCESSED" > $MAKEFILE
cat $MAKEFILE_BAK | \ cat $MAKEFILE_BAK | \
sed -e 's%\(# list of ASM program objects\)%OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)\n\1%' | \
sed -e 's,\(C_SOURCES = \\\),\1\nlibmbus/mbus/mbus-protocol.c \\,' | \ sed -e 's,\(C_SOURCES = \\\),\1\nlibmbus/mbus/mbus-protocol.c \\,' | \
sed -e 's,\(C_SOURCES = \\\),\1\n'"$SRC_EXT"' \\,' | \ sed -e 's,\(C_SOURCES = \\\),\1\n'"$SRC_EXT"' \\,' | \
sed -e 's,\(C_INCLUDES = \\\),\1\n-IUser/Inc \\,' | \ sed -e 's,\(C_INCLUDES = \\\),\1\n-IUser/Inc \\,' | \