fix dependency check logic cause config always disabled

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index c332bf7d361e594f0671ae1dba68647df03d83bd..ce65d6798795f09db3d3cd2480ae930b0d32c5b2 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -1,14 +1,15 @@
 mkinc_dir := $(CURDIR)/makeinc
 
 mkinc_dir := $(CURDIR)/makeinc
 

-include $(mkinc_dir)/os.mkinc

 include $(mkinc_dir)/toolchain.mkinc
 include $(mkinc_dir)/toolchain.mkinc

-include $(mkinc_dir)/qemu.mkinc

 include $(mkinc_dir)/utils.mkinc
 include $(mkinc_dir)/utils.mkinc

+include $(mkinc_dir)/lunabuild.mkinc

 
 

+QEMU_HMP ?= 45454

 ARCH ?= i386
 ARCH ?= i386

+MODE ?= debug

 export ARCH
 
 export ARCH
 

-DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
+DEPS := $(CC) $(LD) $(AR)

 
 CMDLINE ?= console=/dev/ttyFB0
 
 
 CMDLINE ?= console=/dev/ttyFB0
 


@@ -16,9 +17,8 @@ kbuild_dir := build
 kbin_dir := $(kbuild_dir)/bin
 os_img_dir := $(kbuild_dir)/img
 
 kbin_dir := $(kbuild_dir)/bin
 os_img_dir := $(kbuild_dir)/img
 

-os_build_tag := $(OS_NAME)_$(ARCH)_$(OS_VER)

 kbin := $(kbin_dir)/kernel.bin
 kbin := $(kbin_dir)/kernel.bin

-kimg := $(kbuild_dir)/$(os_build_tag).iso
+kimg := $(kbuild_dir)/lunaix.iso

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


@@ -28,81 +28,67 @@ $(DEPS):
                echo "failed" && exit 1;\
        fi
 
                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)
 $(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
 
 .PHONY: kernel
        @mkdir -p $(os_img_dir)/usr
 
 .PHONY: kernel

+.PHONY: rootfs all clean-user clean tool
+

 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)

-kernel:
+kernel: $(lbuild_mkinc)

        $(call status,TASK,$(notdir $@))
        $(call status,TASK,$(notdir $@))

-       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all

 
 

-.PHONY: image
-export KCMD=$(CMDLINE)
-export _OS_NAME=$(OS_NAME)
-image: usr/build kernel
-       $(call status,TASK,$(notdir $@))
-       @./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)"
+       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all

 
 

-usr/build: user
+.NOTPARALLEL:
+export LBUILD ARCH MODE
+all: $(kbuild_dir) tool kernel

 
 

-check: $(DEPS) check-cc GRUB_TEMPLATE
+# --- begin stock user --- #

 
 

-prepare: check $(os_img_dir)
+export PREFIX=usr/includes
+usr/includes: install-header

 
 

-export BUILD_MODE=release
-bootable: $(kbuild_dir) image
+export LBUILD ARCH MODE
+user: usr/includes
+       $(call status,TASK,$@)
+       @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)

 
 

-export BUILD_MODE=debug
-bootable-debug: $(kbuild_dir) image
+clean-user:
+       @$(MAKE) -C usr clean -I $(mkinc_dir)

 
 

-user:
-       $(call status,$@)
-       @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
+rootfs: usr/build
+       $(call status,TASK,$(notdir $@))
+       @./scripts/mkrootfs

 
 

-all: bootable
+usr/build: user

 
 

-instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
-instable: all
+# --- end stock user --- #

 
 

-all-debug: bootable-debug

 
 clean:
 
 clean:

-       @rm -rf $(kbuild_dir) || exit 1
-       @$(MAKE) -C usr clean -I $(mkinc_dir)
+       @$(MAKE) $(MKFLAGS) -C usr clean -I $(mkinc_dir)
+       @$(MAKE) $(MKFLAGS) -C scripts clean -I $(mkinc_dir)
+       @$(MAKE) $(MKFLAGS) -C tests/units clean

        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)

+       
+       @rm -rf $(kbuild_dir) || exit 1
+

 
 

-run: $(BUILD_DIR)/$(OS_ISO)
-       @qemu-system-i386 $(QEMU_OPTIONS)
-       @sleep 1
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
+# --- begin misc --- #

 
 

-debug-qemu: all-debug
-       @i686-elf-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"
+export CFLAGS=-include $(lbuild_config_h)
+unit-test: $(lbuild_config_h)
+       @$(MAKE) $(MKFLAGS) -C tests/units run 

 
 

-debug-qemu-vscode: all-debug
-       @qemu-system-i386 $(call get_qemu_options,$(kimg))
-       @sleep 0.5
-       @telnet 127.0.0.1 $(QEMU_MON_PORT)
+tool:
+       $(call status,TASK,$@)
+       @$(MAKE) $(MKFLAGS) -C scripts all -I $(mkinc_dir)

 
 

-debug-bochs: all-debug
-       @bochs -q -f bochs.cfg
+install-header:
+       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f install_headers.mk all

 
 

-debug-metal: 
-       @printf "@cmc" > $(PORT)
-       @gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file
+# --- end misc --- #
\ No newline at end of file