-include config/make-locations
-include config/make-os
-include config/make-cc
-include config/make-debug-tool
-
-INCLUDES := $(patsubst %, -I%, $(INCLUDES_DIR))
-SOURCE_FILES := $(shell find -name "*.[cS]")
-SRC := $(patsubst ./%, $(OBJECT_DIR)/%.o, $(SOURCE_FILES))
-
-$(OBJECT_DIR):
- @mkdir -p $(OBJECT_DIR)
-
-$(BIN_DIR):
- @mkdir -p $(BIN_DIR)
-
-$(ISO_DIR):
- @mkdir -p $(ISO_DIR)
- @mkdir -p $(ISO_BOOT_DIR)
- @mkdir -p $(ISO_GRUB_DIR)
-
-$(OBJECT_DIR)/%.S.o: %.S
- @mkdir -p $(@D)
- @echo " BUILD: $<"
- @$(CC) $(INCLUDES) -c $< -o $@
-
-$(OBJECT_DIR)/%.c.o: %.c
- @mkdir -p $(@D)
- @echo " BUILD: $<"
- @$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
-
-$(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
- @echo " LINK: $(BIN_DIR)/$(OS_BIN)"
- @$(CC) -T link/linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
-
-$(BUILD_DIR)/$(OS_ISO): $(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)
-
-all: clean $(BUILD_DIR)/$(OS_ISO)
-
-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"
- @${TOOLCHAIN}/i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+mkinc_dir := $(CURDIR)/makeinc
+
+include $(mkinc_dir)/toolchain.mkinc
+include $(mkinc_dir)/utils.mkinc
+include $(mkinc_dir)/lunabuild.mkinc
+
+QEMU_HMP ?= 45454
+ARCH ?= i386
+MODE ?= debug
+export ARCH
+
+DEPS := $(CC) $(LD) $(AR)
+
+CMDLINE ?= console=/dev/ttyFB0
+
+kbuild_dir := build
+kbin_dir := $(kbuild_dir)/bin
+os_img_dir := $(kbuild_dir)/img
+
+kbin := $(kbin_dir)/kernel.bin
+kimg := $(kbuild_dir)/lunaix.iso
+
+$(DEPS):
+ @echo -n "checking $@ .... "
+ @if which $@ > /dev/null; then \
+ echo "ok";\
+ else\
+ echo "failed" && exit 1;\
+ fi
+
+$(kbuild_dir):
+ @mkdir -p $(kbin_dir)
+ @mkdir -p $(os_img_dir)
+ @mkdir -p $(os_img_dir)/usr
+
+.PHONY: kernel
+.PHONY: rootfs all clean-user clean tool
+
+export BUILD_DIR=$(kbin_dir)
+export BUILD_NAME=$(kbin)
+kernel: $(lbuild_mkinc)
+ $(call status,TASK,$(notdir $@))
+
+ @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
+
+.NOTPARALLEL:
+export LBUILD ARCH MODE
+all: $(kbuild_dir) tool kernel
+
+# --- begin stock user --- #
+
+export PREFIX=usr/includes
+usr/includes: install-header
+
+export LBUILD ARCH MODE
+user: usr/includes
+ $(call status,TASK,$@)
+ @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
+
+clean-user:
+ @$(MAKE) -C usr clean -I $(mkinc_dir)
+
+rootfs: usr/build
+ $(call status,TASK,$(notdir $@))
+ @./scripts/mkrootfs
+
+usr/build: user
+
+# --- end stock user --- #
+
clean:
- @rm -rf $(BUILD_DIR) || exit 1
- @sleep 2
-
-run: $(BUILD_DIR)/$(OS_ISO)
- @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -d cpu_reset -monitor telnet::$(QEMU_MON_PORT),server,nowait &
- @sleep 1
- @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-qemu: all-debug
- @${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
- @qemu-system-i386 -m 1G -rtc base=utc -d cpu_reset -s -S -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
- @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
- @${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
- @qemu-system-i386 -s -S -m 1G -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
- @sleep 0.5
- @telnet 127.0.0.1 $(QEMU_MON_PORT)
-
-debug-bochs: all-debug
- @bochs -q -f bochs.cfg
+ @$(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)
+
+ @rm -rf $(kbuild_dir) || exit 1
+
+
+# --- begin misc --- #
+
+export CFLAGS=-include $(lbuild_config_h)
+unit-test: $(lbuild_config_h)
+ @$(MAKE) $(MKFLAGS) -C tests/units run
+
+tool:
+ $(call status,TASK,$@)
+ @$(MAKE) $(MKFLAGS) -C scripts all -I $(mkinc_dir)
+
+install-header:
+ @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f install_headers.mk all
+
+# --- end misc --- #
\ No newline at end of file