diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-19 09:19:58 +0400 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-19 09:19:58 +0400 |
| commit | 37e7a5d80b88d29ae1b76fc6efc9f0b819c18c02 (patch) | |
| tree | f8b82f4ed1e2eb441f66d9c248b2d87b46fafc0f /Makefile | |
| parent | cef56790ea642c4308e34c280508fdcc63a313f0 (diff) | |
| parent | a49a53e48af9bdf64fee43c3772cb654ceb8e6ab (diff) | |
Solve conflicts
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,11 +1,11 @@ -PiegOS: bootloader/bootloader.bin - cp $< ./$@ +PiegOS: kernel/kernel.bin + cp kernel/kernel.bin ./PiegOS -bootloader/bootloader.bin: bootloader/Makefile - cd bootloader && make +kernel/kernel.bin: + cd kernel/ && make clean: - cd bootloader && make clean + cd kernel && make clean rm PiegOS |