X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/cd09c4b222e4ddf45a42522563ae2471a829d1c8..9406e904ddad5db2ba2dd550e21bbb224899fd79:/lunaix-os/makefile diff --git a/lunaix-os/makefile b/lunaix-os/makefile index 625743c..9d3c799 100644 --- a/lunaix-os/makefile +++ b/lunaix-os/makefile @@ -20,20 +20,20 @@ $(ISO_DIR): $(OBJECT_DIR)/%.S.o: %.S @mkdir -p $(@D) - @echo "Compiling: $< -> $@" + @echo "$@" @$(CC) $(INCLUDES) -c $< -o $@ $(OBJECT_DIR)/%.c.o: %.c @mkdir -p $(@D) - @echo "Compiling: $< -> $@" + @echo "$@" @$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS) $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC) - @echo "Linking ..." + @echo "Generating $(BIN_DIR)/$(OS_BIN)" @$(CC) -T 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 + @./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) @@ -48,6 +48,7 @@ all-debug: clean $(BUILD_DIR)/$(OS_ISO) clean: @rm -rf $(BUILD_DIR) + @sleep 1 run: $(BUILD_DIR)/$(OS_ISO) @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &