Skip to content

Commit b1e8b44

Browse files
committed
Fix some Makefile dependency issues
1 parent 3914cac commit b1e8b44

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

Makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,25 @@ build-cross-gcc: $(GCC_SRC)
2626
$(GCC_SRC)/configure --target=$(TARGET) --prefix="$(CROSSDIR)" --disable-nls --enable-languages=c --without-headers && \
2727
make all-gcc && make all-target-libgcc && make install-gcc && make install-target-libgcc
2828

29-
build/:
30-
mkdir -p $@
31-
32-
build/boot.o: build/ src/boot.asm
29+
build/boot.o: src/boot.asm
3330
nasm -felf $< -o $@
3431

35-
build/kernel.o: build/ src/kernel.c
32+
build/kernel.o: src/kernel.c
3633
export PATH="$(CROSSBINDIR):$(PATH)" && \
3734
i586-elf-gcc -c $< -o $@ -std=gnu99 -ffreestanding -O2 -Wall -Wextra
3835

39-
build/jdsos.bin: build/ build/boot.o build/kernel.o
36+
build/jdsos.bin: build/boot.o build/kernel.o
4037
export PATH="$(CROSSBINDIR):$(PATH)" && \
4138
i586-elf-gcc -T src/linker.ld -o $@ -ffreestanding -O2 -nostdlib $? -lgcc
4239

4340
image/boot/jdsos.bin: build/jdsos.bin
4441
cp $< $@
4542

46-
dist/:
47-
mkdir -p $@
48-
49-
dist/jdsos.iso: dist/ image/boot/jdsos.bin
43+
dist/jdsos.iso: image/boot/jdsos.bin
5044
grub-mkrescue -o $@ image
5145

5246
dist: dist/jdsos.iso
47+
all: dist
5348

5449
bochs: dist/jdsos.iso
5550
bochs -f .bochsrc

0 commit comments

Comments
 (0)