X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/1fe5f5eb5378a47bf0f3451762743c162e40faad..8fce4520de1f257819b16f9253fa28dcdae743f4:/lunaix-os/makefile diff --git a/lunaix-os/makefile b/lunaix-os/makefile index e8deacf..af90c06 100644 --- a/lunaix-os/makefile +++ b/lunaix-os/makefile @@ -5,7 +5,6 @@ include $(mkinc_dir)/toolchain.mkinc include $(mkinc_dir)/qemu.mkinc include $(mkinc_dir)/utils.mkinc - ARCH ?= i386 export ARCH @@ -38,13 +37,15 @@ $(kbuild_dir): @mkdir -p $(os_img_dir)/boot/grub @mkdir -p $(os_img_dir)/usr +.PHONY: kernel export BUILD_DIR=$(kbin_dir) export BUILD_NAME=$(kbin) -$(kbin): +kernel: $(call status,TASK,$(notdir $@)) @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all -$(kimg): usr/build $(kbin) +.PHONY: image +image: usr/build kernel $(call status,TASK,$(notdir $@)) @./config-grub.sh ${OS_NAME} $(os_img_dir)/boot/grub/grub.cfg @cp -r usr/build/* $(os_img_dir)/usr @@ -58,10 +59,10 @@ check: $(DEPS) check-cc GRUB_TEMPLATE prepare: check $(os_img_dir) export BUILD_MODE=release -bootable: $(kbuild_dir) $(kimg) +bootable: $(kbuild_dir) image export BUILD_MODE=debug -bootable-debug: $(kbuild_dir) $(kimg) +bootable-debug: $(kbuild_dir) image user: $(call status,$@)