feat: (iso9660) rock ridge extension

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 2735946ad29feaa663c907eb6ce755be91392df8..ede34f48a624bb7c0e3b726038ef5fba49ce4680 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -3,10 +3,26 @@ 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):
+       @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)
+
+check: $(DEPS) check-cc
+
 $(OBJECT_DIR):
        @mkdir -p $(OBJECT_DIR)
 
@@ -32,14 +48,14 @@ $(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)
 
-$(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
+$(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)
 
-all: clean $(BUILD_DIR)/$(OS_ISO)
+all: $(BUILD_DIR)/$(OS_ISO)
 
-instable: O := -O2
+instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
 instable: all
 
 all-debug: O := -Og
@@ -51,7 +67,6 @@ all-debug: clean $(BUILD_DIR)/$(OS_ISO)
 
 clean:
        @rm -rf $(BUILD_DIR) || exit 1
-       @sleep 1
 
 run: $(BUILD_DIR)/$(OS_ISO)
        @qemu-system-i386 $(QEMU_OPTIONS)