refactor: striped more arch-related code from the kernel code base

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index ede34f48a624bb7c0e3b726038ef5fba49ce4680..bb105d4d808e53ee79bf8a2c79adb9bb8a55ea1b 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,13 +1,23 @@
-include config/make-locations
-include config/make-os
-include config/make-cc
-include config/make-debug-tool
+mkinc_dir := $(CURDIR)/makeinc

 
 

-DEPS := $(CC) $(LD) xorriso grub-mkrescue
+include $(mkinc_dir)/os.mkinc
+include $(mkinc_dir)/toolchain.mkinc
+include $(mkinc_dir)/qemu.mkinc
+include $(mkinc_dir)/utils.mkinc

 
 

-INCLUDES := $(patsubst %, -I%, $(INCLUDES_DIR))
-SOURCE_FILES := $(shell find -name "*.[cS]")
-SRC := $(patsubst ./%, $(OBJECT_DIR)/%.o, $(SOURCE_FILES))
+
+ARCH ?= i386
+export ARCH
+
+DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
+
+kbuild_dir := build
+kbin_dir := $(kbuild_dir)/bin
+os_img_dir := $(kbuild_dir)/img
+
+os_build_tag := $(OS_NAME)_$(ARCH)_$(OS_VER)
+kbin := $(kbin_dir)/kernel.bin
+kimg := $(kbuild_dir)/$(os_build_tag).iso

 
 $(DEPS):
        @echo -n "checking $@ .... "
 
 $(DEPS):
        @echo -n "checking $@ .... "


@@ -21,52 +31,55 @@ check-cc:
        @echo -n "checking target i686-elf.... "
        @test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
 
        @echo -n "checking target i686-elf.... "
        @test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
 

-check: $(DEPS) check-cc
+$(kbuild_dir):
+       @mkdir -p $(kbin_dir)
+       @mkdir -p $(os_img_dir)
+       @mkdir -p $(os_img_dir)/boot
+       @mkdir -p $(os_img_dir)/boot/grub
+       @mkdir -p $(os_img_dir)/usr
+
+export BUILD_DIR=$(kbuild_dir)
+export BUILD_NAME=$(kbin)
+$(kbin):
+       $(call status,TASK,$(notdir $@))
+       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all

 
 

-$(OBJECT_DIR):
-       @mkdir -p $(OBJECT_DIR)
+$(kimg): usr/build $(kbin)
+       $(call status,TASK,$(notdir $@))
+       @./config-grub.sh ${OS_NAME} $(os_img_dir)/boot/grub/grub.cfg
+       @cp -r usr/build/* $(os_img_dir)/usr
+       @cp $(kbin) $(os_img_dir)/boot
+       @grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"

 
 

-$(BIN_DIR):
-       @mkdir -p $(BIN_DIR)
+usr/build: user

 
 

-$(ISO_DIR):
-       @mkdir -p $(ISO_DIR)
-       @mkdir -p $(ISO_BOOT_DIR)
-       @mkdir -p $(ISO_GRUB_DIR)
+check: $(DEPS) check-cc GRUB_TEMPLATE

 
 

-$(OBJECT_DIR)/%.S.o: %.S
-       @mkdir -p $(@D)
-       @echo "  CC    $<"
-       @$(CC) $(INCLUDES) -c $< -o $@
+prepare: check $(os_img_dir)

 
 

-$(OBJECT_DIR)/%.c.o: %.c 
-       @mkdir -p $(@D)
-       @echo "  CC    $<"
-       @$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+export BUILD_MODE=release
+bootable: $(kbuild_dir) $(kimg)

 
 

-$(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-       @echo "  LD    $(BIN_DIR)/$(OS_BIN)"
-       @$(CC) -T link/linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+export BUILD_MODE=debug
+bootable-debug: $(kbuild_dir) $(kimg)

 
 

-$(BUILD_DIR)/$(OS_ISO): check $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
-       @./config-grub.sh ${OS_NAME} $(ISO_GRUB_DIR)/grub.cfg
-       @cp $(BIN_DIR)/$(OS_BIN) $(ISO_BOOT_DIR)
-       @grub-mkrescue -o $(BUILD_DIR)/$(OS_ISO) $(ISO_DIR)
+user:
+       $(call status,$@)
+       @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)

 
 

-all: $(BUILD_DIR)/$(OS_ISO)
+all: bootable

 
 instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
 instable: all
 
 
 instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
 instable: all
 

-all-debug: O := -Og
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
-all-debug: LDFLAGS := -g -ffreestanding $(O) -nostdlib -lgcc
-all-debug: clean $(BUILD_DIR)/$(OS_ISO)
-       @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
-       @i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+all-debug: bootable-debug
+       @echo "Dumping the disassembled kernel code to $(kbuild_dir)/kdump.txt"
+       @i686-elf-objdump -S $(kbin) > $(kbuild_dir)/kdump.txt

 
 clean:
 
 clean:

-       @rm -rf $(BUILD_DIR) || exit 1
+       @rm -rf $(kbuild_dir) || exit 1
+       @$(MAKE) -C usr clean -I $(mkinc_dir)
+       @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)

 
 run: $(BUILD_DIR)/$(OS_ISO)
        @qemu-system-i386 $(QEMU_OPTIONS)
 
 run: $(BUILD_DIR)/$(OS_ISO)
        @qemu-system-i386 $(QEMU_OPTIONS)


@@ -74,14 +87,14 @@ run: $(BUILD_DIR)/$(OS_ISO)
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug

-       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-       @qemu-system-i386 $(QEMU_OPTIONS)
+       @i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
+       @qemu-system-i386 $(call get_qemu_options,$(kimg))

        @sleep 1
        @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
        @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
 debug-qemu-vscode: all-debug
        @sleep 1
        @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
        @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
 debug-qemu-vscode: all-debug

-       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+       @i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg

        @qemu-system-i386 $(QEMU_OPTIONS)
        @sleep 0.5
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
        @qemu-system-i386 $(QEMU_OPTIONS)
        @sleep 0.5
        @telnet 127.0.0.1 $(QEMU_MON_PORT)


@@ -91,4 +104,4 @@ debug-bochs: all-debug
 
 debug-metal: 
        @printf "@cmc" > $(PORT)
 
 debug-metal: 
        @printf "@cmc" > $(PORT)

-       @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file
+       @gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file