From ae2d0655e95841fb6c995c840e81f3c60b997c41 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 13 Nov 2019 20:43:02 +0100 Subject: [PATCH] Some Makefile stuff --- Makefile | 4 +- ProjectTree | 157 ----------------------------------------- build/bin/.placeholder | 0 3 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 ProjectTree delete mode 100644 build/bin/.placeholder diff --git a/Makefile b/Makefile index c1a430f..ac805e9 100644 --- a/Makefile +++ b/Makefile @@ -241,11 +241,13 @@ $(KOBJDIR)/%.o: %.c | $(KOBJDIR) $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @echo ${CL2}[$@] ${NC}Objcopy...${CL3} + @mkdir -p $(shell dirname $@) @$(OBJCOPY) -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid @echo ${CL2}[$@] ${CL}Success.${CL3} $(LOBJDIR)/kaleid.x86_64: $(LibCObj) $(KernObj) $(LOBJDIR)/loader.o $(BUILDDIR)/kernel.ld @echo ${CL2}[$@] ${NC}Linking kernel objects...${CL3} + @mkdir -p $(shell dirname $@) @$(LD) $(LDFLAGS) -T $(BUILDDIR)/kernel.ld \ $(LOBJDIR)/loader.o $(KernObj) $(LibCObj) \ -o $(LOBJDIR)/kaleid.x86_64 @@ -308,5 +310,5 @@ dust: clean: @rm -Rvf ./ProjectTree $(BUILDDIR)/*.log - @rm -Rvf $(BINDIR)/* $(OBJDIR)/* + @rm -Rvf $(BINDIR) $(OBJDIR) @echo ${CL2}[$@] ${CL}Cleaned.${CL3} diff --git a/ProjectTree b/ProjectTree deleted file mode 100644 index df9289b..0000000 --- a/ProjectTree +++ /dev/null @@ -1,157 +0,0 @@ -#=----------------------------------------------------------------------------=# -# GNU GPL OS/K # -# # -# Desc: # -# # -# # -# Copyright © 2018-2019 The OS/K Team # -# # -# This file is part of OS/K. # -# # -# OS/K is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# any later version. # -# # -# OS/K is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY# without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with OS/K. If not, see . # -#=----------------------------------------------------------------------------=# - - -. -├── boot -│   ├── grub -│   │   ├── grub.cfg -│   │   └── multiboot.pdf -│   ├── loader -│   │   ├── cpu -│   │   │   ├── cpu32.inc -│   │   │   └── cpu.inc -│   │   ├── io -│   │   │   └── terminal.inc -│   │   ├── mem -│   │   │   ├── management.inc -│   │   │   └── structures.inc -│   │   ├── multiboot -│   │   │   ├── check.inc -│   │   │   └── header.inc -│   │   └── loader.asm -│   └── folder.desc -├── build -│   ├── create_disk.sh -│   ├── install-os-k.sh -│   └── kernel.ld -├── include -│   ├── ex -│   │   ├── lock.h -│   │   └── malloc.h -│   ├── init -│   │   ├── boot.h -│   │   └── mboot.h -│   ├── io -│   │   ├── ata.h -│   │   ├── cursor.h -│   │   ├── keyb.h -│   │   ├── spkr.h -│   │   └── vga.h -│   ├── ke -│   │   ├── cpuid.h -│   │   ├── idt.h -│   │   ├── proc.h -│   │   ├── sched.h -│   │   ├── spinlock.h -│   │   └── time.h -│   ├── lib -│   │   ├── buf.h -│   │   └── list.h -│   ├── mm -│   │   ├── heap.h -│   │   ├── malloc.h -│   │   └── mm.h -│   ├── po -│   │   └── shtdwn.h -│   ├── sh -│   │   ├── argv.h -│   │   └── shell.h -│   ├── asm.h -│   ├── errno.h -│   ├── kernel.h -│   ├── libc.h -│   └── vers.h -├── kaleid -│   ├── kernel -│   │   ├── init -│   │   │   ├── info.c -│   │   │   ├── init.c -│   │   │   ├── ssp.c -│   │   │   └── table.c -│   │   ├── io -│   │   │   ├── ata.asm -│   │   │   ├── ata.c -│   │   │   ├── cursor.c -│   │   │   ├── keyb.c -│   │   │   ├── spkr.c -│   │   │   └── vga.c -│   │   ├── ke -│   │   │   ├── cpuf.asm -│   │   │   ├── cpuf.inc -│   │   │   ├── cpuid.c -│   │   │   ├── idt.c -│   │   │   ├── isr.asm -│   │   │   ├── log.c -│   │   │   ├── panic.c -│   │   │   ├── pit.c -│   │   │   └── rtc.c -│   │   ├── mm -│   │   │   ├── gdt.asm -│   │   │   ├── gdt.c -│   │   │   ├── heap.c -│   │   │   ├── malloc.c -│   │   │   ├── map.c -│   │   │   ├── paging.asm -│   │   │   └── paging.c -│   │   ├── po -│   │   │   └── shtdwn.c -│   │   ├── ps -│   │   │   └── sched.c -│   │   └── sh -│   │   ├── argv.c -│   │   ├── musage.c -│   │   ├── shcmds.c -│   │   ├── shell.c -│   │   └── shell.h -│   ├── libbuf -│   │   ├── bclose.c -│   │   ├── bflush.c -│   │   ├── bgetc.c -│   │   ├── bmisc.c -│   │   ├── bopen.c -│   │   ├── bprint.c -│   │   ├── bputc.c -│   │   ├── bread.c -│   │   ├── bscan.c -│   │   ├── bscroll.c -│   │   └── bwrite.c -│   └── libc -│   ├── atoi.c -│   ├── ctype.c -│   ├── errno.c -│   ├── itoa.c -│   ├── mem.c -│   ├── rand.c -│   ├── sprintf.c -│   ├── string.c -│   └── strtol.c -├── AUTHORS -├── ChangeLog -├── COPYING -├── Makefile -├── ProjectTree -└── README.md - -28 directories, 101 files diff --git a/build/bin/.placeholder b/build/bin/.placeholder deleted file mode 100644 index e69de29..0000000