Remove the .elf suffix from the kernel filename
This commit is contained in:
parent
e5b2641019
commit
cbc2e76082
4
.gitignore
vendored
4
.gitignore
vendored
@ -2,8 +2,8 @@ Luna.iso
|
||||
toolchain/
|
||||
.vscode/
|
||||
**/*.o
|
||||
initrd/boot/moon.elf
|
||||
kernel/bin/moon.elf
|
||||
initrd/boot/moon
|
||||
kernel/bin/moon
|
||||
initrd/sys/moon.sym
|
||||
initrd/bin/**
|
||||
apps/bin/**
|
||||
|
2
Makefile
2
Makefile
@ -16,7 +16,7 @@ clean: initrd-clean
|
||||
@$(MAKE) -C apps clean
|
||||
|
||||
initrd-clean:
|
||||
rm -f $(LUNA_ROOT)/initrd/boot/moon.elf $(LUNA_ROOT)/Luna.iso
|
||||
rm -f $(LUNA_ROOT)/initrd/boot/moon $(LUNA_ROOT)/Luna.iso
|
||||
rm -rf $(LUNA_ROOT)/initrd/bin
|
||||
|
||||
install:
|
||||
|
@ -1,3 +1,3 @@
|
||||
screen=1024x768
|
||||
kernel=boot/moon.elf
|
||||
kernel=boot/moon
|
||||
verbose=1
|
@ -27,7 +27,7 @@ OBJS = $(patsubst $(MOON_SRC)/%.cpp, $(MOON_OBJ)/%.cpp.o, $(CXX_SRC))
|
||||
OBJS += $(patsubst $(MOON_SRC)/%.c, $(MOON_OBJ)/%.c.o, $(C_SRC))
|
||||
OBJS += $(patsubst $(MOON_SRC)/%.asm, $(MOON_OBJ)/%.asm.o, $(NASM_SRC))
|
||||
|
||||
default: $(MOON_BIN)/moon.elf
|
||||
default: $(MOON_BIN)/moon
|
||||
|
||||
$(MOON_OBJ)/main.cpp.o: $(MOON_SRC)/main.cpp
|
||||
@mkdir -p $(@D)
|
||||
@ -55,17 +55,17 @@ $(MOON_OBJ)/%.asm.o: $(MOON_SRC)/%.asm
|
||||
|
||||
build: $(OBJS)
|
||||
@mkdir -p $(MOON_BIN)
|
||||
$(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon.elf
|
||||
$(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon
|
||||
|
||||
clean:
|
||||
rm -rf $(MOON_OBJ)/*
|
||||
rm -rf $(MOON_BIN)/*
|
||||
|
||||
install: $(MOON_BIN)/moon.elf
|
||||
install: $(MOON_BIN)/moon
|
||||
@mkdir -p $(LUNA_ROOT)/initrd/boot
|
||||
cp $^ $(LUNA_ROOT)/initrd/boot/moon.elf
|
||||
cp $^ $(LUNA_ROOT)/initrd/boot/moon
|
||||
$(LUNA_ROOT)/tools/generate-symbols.sh
|
||||
$(STRIP) $(LUNA_ROOT)/initrd/boot/moon.elf
|
||||
$(STRIP) $(LUNA_ROOT)/initrd/boot/moon
|
||||
|
||||
.PHONY: build clean install FORCE
|
||||
FORCE:
|
@ -6,4 +6,4 @@ source $(dirname $0)/env.sh
|
||||
|
||||
cd $LUNA_ROOT
|
||||
|
||||
nm -C -n initrd/boot/moon.elf | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym
|
||||
nm -C -n initrd/boot/moon | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym
|
Loading…
Reference in New Issue
Block a user