Skip to content

Commit df06ba8

Browse files
crawfxrdcrawfxrd
committed
make: Rename all included files to Makefile.mk
Standardize the Makefiles to use a single name. Done with: find . -name *.mk -not -path '*/toolchain.mk' -execdir mv {} Makefile.mk \; grep -rl common.mk src/ | xargs sed -i 's/common.mk/Makefile.mk/' grep -rl keyboard.mk src/ | xargs sed -i 's/keyboard.mk/Makefile.mk/' grep -rl scratch.mk src/ | xargs sed -i 's/scratch.mk/Makefile.mk/' grep -rl flash.mk src/ | xargs sed -i 's/flash.mk/Makefile.mk/' Signed-off-by: Tim Crawford <[email protected]>
1 parent 890906e commit df06ba8

File tree

63 files changed

+91
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+91
-88
lines changed

‎Makefile‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ all: $(BUILD)/ec.rom
2929

3030
# Include common source
3131
COMMON_DIR=src/common
32-
INCLUDE += $(COMMON_DIR)/common.mk
32+
INCLUDE += $(COMMON_DIR)/Makefile.mk
3333
CFLAGS=-I$(COMMON_DIR)/include -D__FIRMWARE_VERSION__=$(VERSION)
34-
include $(COMMON_DIR)/common.mk
34+
include $(COMMON_DIR)/Makefile.mk
3535
SRC += $(foreach src, $(common-y), $(COMMON_DIR)/$(src))
3636

3737
# Include the board's source
3838
BOARD_DIR=src/board/$(BOARD)
39-
INCLUDE += $(BOARD_DIR)/board.mk
39+
INCLUDE += $(BOARD_DIR)/Makefile.mk
4040
CFLAGS+=-I$(BOARD_DIR)/include -D__BOARD__=$(BOARD)
41-
include $(BOARD_DIR)/board.mk
41+
include $(BOARD_DIR)/Makefile.mk
4242
SRC += $(foreach src, $(board-y), $(BOARD_DIR)/$(src))
4343
SRC += $(foreach src, $(board-common-y), $(SYSTEM76_COMMON_DIR)/$(src))
4444
SRC += $(foreach src, $(keyboard-y), $(KEYBOARD_DIR)/$(src))
4545

4646
# The board will define the embedded controller
4747
# Include the embedded controller's source
4848
EC_DIR=src/ec/$(EC)
49-
INCLUDE += $(EC_DIR)/ec.mk
49+
INCLUDE += $(EC_DIR)/Makefile.mk
5050
CFLAGS+=-I$(EC_DIR)/include
51-
include $(EC_DIR)/ec.mk
51+
include $(EC_DIR)/Makefile.mk
5252
SRC += $(foreach src, $(ec-y), $(EC_DIR)/$(src))
5353

5454
# The EC will define the architecture
5555
# Include the architecture's source
5656
ARCH_DIR=src/arch/$(ARCH)
57-
INCLUDE += $(ARCH_DIR)/arch.mk
57+
INCLUDE += $(ARCH_DIR)/Makefile.mk
5858
CFLAGS+=-I$(ARCH_DIR)/include -D__ARCH__=$(ARCH)
59-
include $(ARCH_DIR)/arch.mk
59+
include $(ARCH_DIR)/Makefile.mk
6060
SRC += $(foreach src, $(arch-y), $(ARCH_DIR)/$(src))
6161

6262
include $(ARCH_DIR)/toolchain.mk
@@ -87,10 +87,13 @@ fmt:
8787
lint:
8888
./scripts/lint/lint.sh
8989

90+
# TODO: Move "common" out of board directory
9091
.PHONY: list-boards
9192
list-boards:
92-
@cd src/board && for board in */*/board.mk; do \
93-
echo "$$(dirname "$$board")"; \
93+
@cd src/board && for board in */*/Makefile.mk; do \
94+
if [ "$$board" != "system76/common/Makefile.mk" ]; then \
95+
echo "$$(dirname "$$board")"; \
96+
fi; \
9497
done
9598

9699
# This target is run during setup, and is not shown in the help text.

‎docs/debugging.md‎

Lines changed: 2 additions & 2 deletions

src/arch/8051/arch.mk renamed to src/arch/8051/Makefile.mk

File renamed without changes.

src/board/system76/addw1/board.mk renamed to src/board/system76/addw1/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ CONFIG_FAN2_POINTS = " \
5959
"
6060

6161
# Add system76 common code
62-
include src/board/system76/common/common.mk
62+
include src/board/system76/common/Makefile.mk

src/board/system76/addw2/board.mk renamed to src/board/system76/addw2/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ CONFIG_FAN2_POINTS = " \
5959
"
6060

6161
# Add system76 common code
62-
include src/board/system76/common/common.mk
62+
include src/board/system76/common/Makefile.mk

src/board/system76/addw3/board.mk renamed to src/board/system76/addw3/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ CONFIG_FAN2_POINTS = " \
6565
"
6666

6767
# Add system76 common code
68-
include src/board/system76/common/common.mk
68+
include src/board/system76/common/Makefile.mk

src/board/system76/addw4/board.mk renamed to src/board/system76/addw4/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ CONFIG_FAN2_POINTS = " \
6565
"
6666

6767
# Add system76 common code
68-
include src/board/system76/common/common.mk
68+
include src/board/system76/common/Makefile.mk

src/board/system76/bonw14/board.mk renamed to src/board/system76/bonw14/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ CONFIG_FAN2_POINTS = " \
5959
"
6060

6161
# Add system76 common code
62-
include src/board/system76/common/common.mk
62+
include src/board/system76/common/Makefile.mk

src/board/system76/bonw15-b/board.mk renamed to src/board/system76/bonw15-b/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ CONFIG_FAN2_POINTS = " \
7272
"
7373

7474
# Add system76 common code
75-
include src/board/system76/common/common.mk
75+
include src/board/system76/common/Makefile.mk

src/board/system76/bonw15/board.mk renamed to src/board/system76/bonw15/Makefile.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ CONFIG_FAN2_POINTS = " \
6969
"
7070

7171
# Add system76 common code
72-
include src/board/system76/common/common.mk
72+
include src/board/system76/common/Makefile.mk

0 commit comments

Comments
 (0)