X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/63ba0036aaf8ec77590db47d936942e78ff3ed6f..707c6653985f55463e8a59a58b248ba8af3b44b2:/lunaix-os/makefile?ds=sidebyside

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index ede34f4..c1c800c 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -3,11 +3,7 @@ include config/make-os
 include config/make-cc
 include config/make-debug-tool
 
-DEPS := $(CC) $(LD) xorriso grub-mkrescue
-
-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 $@ .... "
@@ -21,47 +17,45 @@ check-cc:
 	@echo -n "checking target i686-elf.... "
 	@test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
 
-check: $(DEPS) check-cc
-
 $(OBJECT_DIR):
 	@mkdir -p $(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)
-	@echo "  CC    $<"
-	@$(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
+
+usrlib-debug: prepare makefile.usr
+	@make -f makefile.usr usr-runtime-debug
 
-$(OBJECT_DIR)/%.c.o: %.c 
-	@mkdir -p $(@D)
-	@echo "  CC    $<"
-	@$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+usr-prog: prepare usrlib makefile.prog
+	@make -f makefile.prog all
 
-$(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	@echo "  LD    $(BIN_DIR)/$(OS_BIN)"
-	@$(CC) -T link/linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+bootable: usr-prog usrlib makefile.ker
+	@make -f makefile.ker all
 
-$(BUILD_DIR)/$(OS_ISO): check $(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-debug: usr-prog usrlib-debug makefile.ker
+	@make -f makefile.ker all-debug
 
-all: $(BUILD_DIR)/$(OS_ISO)
+all: bootable
 
 instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
 instable: all
 
-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)
+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