Improve cake allocator's memory utilisation (#43)

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 6e9fdb0b21704a5b9c37c0d770e3d19941ab6256..f53d62ea418a1fba0f0a3ae0596b86099ef5748c 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,11 +1,12 @@
 mkinc_dir := $(CURDIR)/makeinc
 
-include $(mkinc_dir)/os.mkinc
 include $(mkinc_dir)/toolchain.mkinc
-include $(mkinc_dir)/qemu.mkinc
 include $(mkinc_dir)/utils.mkinc
+include $(mkinc_dir)/lunabuild.mkinc
 
+QEMU_HMP ?= 45454
 ARCH ?= i386
+MODE ?= debug
 export ARCH
 
 DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
@@ -16,9 +17,8 @@ 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
+kimg := $(kbuild_dir)/lunaix.iso
 
 $(DEPS):
        @echo -n "checking $@ .... "
@@ -28,10 +28,6 @@ $(DEPS):
                echo "failed" && exit 1;\
        fi
 
-check-cc:
-       @echo -n "checking target i686-elf.... "
-       @test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
-
 $(kbuild_dir):
        @mkdir -p $(kbin_dir)
        @mkdir -p $(os_img_dir)
@@ -42,67 +38,37 @@ $(kbuild_dir):
 .PHONY: kernel
 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
-kernel:
+kernel: $(lbuild_mkinc)
        $(call status,TASK,$(notdir $@))
+
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
+.NOTPARALLEL:
 .PHONY: image
 export KCMD=$(CMDLINE)
-export _OS_NAME=$(OS_NAME)
-image: usr/build kernel
+export LBUILD ARCH MODE
+image: $(kbuild_dir) kernel usr/build
        $(call status,TASK,$(notdir $@))
-       @./config-grub.sh $(os_img_dir)/boot/grub/grub.cfg
+       $(call status,PACK,$(kimg))
+
+       @./scripts/grub/config-grub.sh $(os_img_dir)/boot/grub/grub.cfg
        @cp -r usr/build/* $(os_img_dir)/usr
        @cp -r $(kbin_dir)/* $(os_img_dir)/boot
-       @grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"
+       @grub-mkrescue -o $(kimg) $(os_img_dir)\
+               -- -volid "LUNA" -system_id "Lunaix" \
+               -report_about FAILURE -abort_on FAILURE
 
 usr/build: user
 
-check: $(DEPS) check-cc GRUB_TEMPLATE
-
-prepare: check $(os_img_dir)
-
-export BUILD_MODE=release
-bootable: $(kbuild_dir) image
-
-export BUILD_MODE=debug
-bootable-debug: $(kbuild_dir) image
+prepare: $(os_img_dir)
 
+export LBUILD ARCH MODE
 user:
-       $(call status,$@)
+       $(call status,TASK,$@)
        @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
 
-all: bootable
-
-instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
-instable: all
-
-all-debug: bootable-debug
-
 clean:
-       @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)
-       @sleep 1
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-qemu: all-debug
-       @objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
-       @qemu-system-i386 $(call get_qemu_options,$(kimg))
-       @sleep 1
-       @QMPORT=$(QEMU_MON_PORT) gdb $(kbin) -ex "target remote localhost:1234"
-
-debug-qemu-vscode: all-debug
-       @qemu-system-i386 $(call get_qemu_options,$(kimg))
-       @sleep 0.5
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-bochs: all-debug
-       @bochs -q -f bochs.cfg
-
-debug-metal: 
-       @printf "@cmc" > $(PORT)
-       @gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file
+       @rm -rf $(kbuild_dir) || exit 1
+       @rm -rf .builder || exit 1