diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-20 19:23:33 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-20 19:23:33 +0200 |
| commit | 768ada13917aeda373e6ff5fee21faf90c963746 (patch) | |
| tree | 9e26d7d65e1693d1a7f9fd93c9fd33b41d175464 /Makefile | |
| parent | 6ec4b3d31080f90393e72989d559cfb76eff6f9d (diff) | |
| parent | 9836acd720988af30250c2c1ec18d618664dea4e (diff) | |
| download | Melon-768ada13917aeda373e6ff5fee21faf90c963746.tar.gz Melon-768ada13917aeda373e6ff5fee21faf90c963746.zip | |
Merge branch 'usermode_syscalls'
Conflicts:
Source/Kernel/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,12 +1,15 @@ .PHONY: clean, mrproper, Init.rfs -Projects = Kernel Tools/MakeRamFS +Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/SampleApps Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ + Source/Applications/SampleApps/asmdemo:/ad \ + Source/Applications/SampleApps/cxxdemo:/cd \ + Source/Applications/Shell/Shell:/shell \ :/Useless \ Source/Kernel/Ressources/Texts/Info.txt:/Useless/Info.txt \ Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo @@ -31,9 +34,9 @@ clean: make -C Source/$$p clean -s; \ done -mproper: +mrproper: for p in $(Projects); do \ - make -C Source mrproper -s; \ + make -C Source/$$p mrproper -s; \ done $(RamFS): |