Merge branch 'interrupt-rework' into prog-loader

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 4993318c3ec8ac4da4cb4f483fe4ef2b461da846..c1c800ccb68797a7630e44b7c62de4e4b1cddd35 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -3,9 +3,19 @@ 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))
+DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
+
+$(DEPS):
+       @echo -n "checking $@ .... "
+       @if which $@ > /dev/null; then \
+               echo "ok";\
+       else\
+               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)
 
 $(OBJECT_DIR):
        @mkdir -p $(OBJECT_DIR)
@@ -13,50 +23,66 @@ $(OBJECT_DIR):
 $(BIN_DIR):
        @mkdir -p $(BIN_DIR)
 
+$(USR_DIR):
+       @mkdir -p $(USR_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)
-       $(CC) $(INCLUDES) -c $< -o $@
+check: $(DEPS) check-cc GRUB_TEMPLATE
+
+prepare: check $(OBJECT_DIR) $(BIN_DIR) $(ISO_DIR) $(USR_DIR)
+
+usrlib: prepare makefile.usr
+       @make -f makefile.usr usr-runtime
 
-$(OBJECT_DIR)/%.c.o: %.c 
-       @mkdir -p $(@D)
-       $(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+usrlib-debug: prepare makefile.usr
+       @make -f makefile.usr usr-runtime-debug
 
-$(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-       $(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+usr-prog: prepare usrlib makefile.prog
+       @make -f makefile.prog all
 
-$(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)
+bootable: usr-prog usrlib makefile.ker
+       @make -f makefile.ker all
 
-all: clean $(BUILD_DIR)/$(OS_ISO)
+bootable-debug: usr-prog usrlib-debug makefile.ker
+       @make -f makefile.ker all-debug
 
-all-debug: O := -O0
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) -fomit-frame-pointer
-all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
-all-debug: clean $(BUILD_DIR)/$(OS_ISO)
+all: bootable
+
+instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+instable: all
+
+all-debug: clean bootable-debug
        @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
        @i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
-       @rm -rf $(BUILD_DIR)
+       @rm -rf $(BUILD_DIR) || exit 1
 
 run: $(BUILD_DIR)/$(OS_ISO)
-       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::45454,server,nowait &
+       @qemu-system-i386 $(QEMU_OPTIONS)
        @sleep 1
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
-       @objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-       @qemu-system-i386 -s -S -kernel $(BIN_DIR)/$(OS_BIN) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+       @qemu-system-i386 $(QEMU_OPTIONS)
        @sleep 1
-       @$(QEMU_MON_TERM) -e "telnet 127.0.0.1 $(QEMU_MON_PORT)"
+       @$(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
+       @qemu-system-i386 $(QEMU_OPTIONS)
+       @sleep 0.5
+       @telnet 127.0.0.1 $(QEMU_MON_PORT)
+
 debug-bochs: all-debug
-       @bochs -q -f bochs.cfg
\ No newline at end of file
+       @bochs -q -f bochs.cfg
+
+debug-metal: 
+       @printf "@cmc" > $(PORT)
+       @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file