Skip to content

Commit 54f9099

Browse files
committed
update makefile
1 parent eb0a7cf commit 54f9099

File tree

2 files changed

+40
-16
lines changed

2 files changed

+40
-16
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
commit eb0a7cf5f301e5d63a14cc1afe73ec84fe2653e5
2+
Author: Alexeev Bronislav <alexeev.dev@mail.ru>
3+
Date: Fri Aug 22 07:06:26 2025 +0700
4+
5+
optimizations, cleaning code and fix ports bug
6+
17
commit 84d17ac56b97d198ca97cf389da05a5b12edecce
28
Author: Alexeev Bronislav <alexeev.dev@mail.ru>
39
Date: Fri Aug 22 05:25:51 2025 +0700

Makefile

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,62 @@ C_OBJS = $(C_SOURCES:$(SRC_DIR)/%.c=$(BIN_DIR)/%.o)
2323

2424
OBJS = $(KERNEL_ENTRY) $(INTERRUPT_OBJ) $(C_OBJS)
2525

26+
RED=\033[0;31m
27+
GREEN=\033[0;32m
28+
YELLOW=\033[0;33m
29+
BLUE=\033[0;34m
30+
CYAN=\033[0;36m
31+
RESET=\033[0m
32+
2633
all: $(BIN_DIR)/kintsugios.bin
2734

2835
$(BIN_DIR)/kintsugios.bin: $(BIN_DIR)/bootsector.bin $(BIN_DIR)/kernel.bin
29-
cat $^ > $@
36+
@printf "$(BLUE)[CAT] Cat %s %-42s -> %s$(RESET)\n" "bootsector" "kernel" "$(BIN_DIR)/kintsugios.bin"
37+
@cat $^ > $@
3038

3139
$(BIN_DIR)/bootsector.bin: $(SRC_DIR)/bootloader/bootsector.asm
32-
mkdir -p $(BIN_DIR)
33-
$(ASM) $(ASMFLAGS_BIN) $< -o $@
40+
@printf "$(CYAN)[ASM] Compiling %-50s -> %s$(RESET)\n" "bootsector.asm" "bootsector.bin"
41+
@mkdir -p $(BIN_DIR)
42+
@$(ASM) $(ASMFLAGS_BIN) $< -o $@
3443

3544
$(BIN_DIR)/kernel.bin: $(OBJS)
36-
$(LD) $(LDFLAGS) $^ -o $@
45+
@printf "$(BLUE)[LD] Linking %-50s -> %s$(RESET)\n" "$^" "$@"
46+
@$(LD) $(LDFLAGS) $^ -o $@
3747

3848
$(BIN_DIR)/%.o: $(SRC_DIR)/%.asm
39-
mkdir -p $(dir $@)
40-
$(ASM) $(ASMFLAGS_ELF) $< -o $@
49+
@printf "$(CYAN)[ASM] Compiling %-50s -> %s$(RESET)\n" "$<" "$@"
50+
@mkdir -p $(dir $@)
51+
@$(ASM) $(ASMFLAGS_ELF) $< -o $@
4152

4253
$(BIN_DIR)/%.o: $(SRC_DIR)/%.c
43-
mkdir -p $(dir $@)
44-
$(CC) $(CFLAGS) -c $< -o $@
54+
@printf "$(CYAN)[CC] Compiling %-50s -> %s$(RESET)\n" "$<" "$@"
55+
@mkdir -p $(dir $@)
56+
@$(CC) $(CFLAGS) -c $< -o $@
4557

4658
diskimg: $(BIN_DIR)/kintsugios.bin
47-
mkdir -p $(DISKIMG_DIR)
48-
dd if=/dev/zero of=$(DISKIMG_DIR)/$(DISKIMG_NAME) bs=1024 count=1440
49-
dd if=$(BIN_DIR)/kintsugios.bin of=$(DISKIMG_DIR)/$(DISKIMG_NAME) conv=notrunc
59+
@printf "$(BLUE)[DD] Make IMG %-50s -> %s$(RESET)\n" "$(BIN_DIR)/kintsugios.bin" "$(DISKIMG_DIR)/$(DISKIMG_NAME)"
60+
@mkdir -p $(DISKIMG_DIR)
61+
@dd if=/dev/zero of=$(DISKIMG_DIR)/$(DISKIMG_NAME) bs=1024 count=1440
62+
@dd if=$(BIN_DIR)/kintsugios.bin of=$(DISKIMG_DIR)/$(DISKIMG_NAME) conv=notrunc
5063

5164
run_bin: $(BIN_DIR)/kintsugios.bin
52-
qemu-system-i386 -fda $(BIN_DIR)/kintsugios.bin
65+
@printf "$(GREEN)[QEMU] Run bin %-50s$(RESET)\n" "$(BIN_DIR)/kintsugios.bin"
66+
@qemu-system-i386 -fda $(BIN_DIR)/kintsugios.bin
5367

5468
run: diskimg
55-
qemu-system-i386 -fda $(DISKIMG_DIR)/$(DISKIMG_NAME) -boot a
69+
@printf "$(GREEN)[QEMU] Run img %-50s$(RESET)\n" "$(DISKIMG_DIR)/$(DISKIMG_NAME)"
70+
@qemu-system-i386 -fda $(DISKIMG_DIR)/$(DISKIMG_NAME) -boot a
5671

5772
debug: diskimg
58-
qemu-system-i386 -fda $(DISKIMG_DIR)/$(DISKIMG_NAME) -boot a -s -S
73+
@printf "$(GREEN)[QEMU] Debug img %-50s$(RESET)\n" "$(DISKIMG_DIR)/$(DISKIMG_NAME)"
74+
@qemu-system-i386 -fda $(DISKIMG_DIR)/$(DISKIMG_NAME) -boot a -s -S
5975

6076
clean:
61-
rm -rf $(BIN_DIR)/*
77+
@printf "$(RED)[RM] Clean bin %-50s$(RESET)\n" "$(BIN_DIR)"
78+
@rm -rf $(BIN_DIR)/*
6279

6380
clean_all:
64-
rm -rf $(BIN_DIR)/* $(DISKIMG_DIR)/*
81+
@printf "$(RED)[RM] Clean all %-50s$(RESET)\n" "$(BIN_DIR)"
82+
@rm -rf $(BIN_DIR)/* $(DISKIMG_DIR)/*
6583

6684
.PHONY: all diskimg run run_bin clean clean_all

0 commit comments

Comments
 (0)