diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
| commit | 09353da6e91a0968ae24d4b4d97ed434520e6217 (patch) | |
| tree | 016694d12e9dfebc773cef629eb56556d0024b22 /Makefile | |
| parent | 247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b (diff) | |
| parent | 18454dc8be12827a84c2ebc58aa5d31bb44e1e6a (diff) | |
| download | Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.tar.gz Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.zip | |
Merge branch 'framework'
Conflicts:
.gitignore
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -4,20 +4,15 @@ Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/PaperW Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs -RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ - :/Applications :/Applications/Demos :/Applications/Shell :/Mount \ +RamFSFiles = :/System :/System/Configuration :/System/Keymaps \ Source/Kernel/Ressources/Configuration/Users:/System/Configuration/Users \ Source/Kernel/Ressources/Configuration/Groups:/System/Configuration/Groups \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ - Source/Applications/Demos/asmdemo:/Applications/Demos/ASMDemo.app \ - Source/Applications/Demos/cxxdemo:/Applications/Demos/CPPDemo.app \ - Source/Applications/Demos/GOL:/Applications/Demos/GOL.app \ - Source/Applications/Shell/Shell:/Applications/Shell/Shell.app \ - Source/Applications/Shell/Help.txt:/Applications/Shell/Help.txt \ - Source/Applications/PaperWork/PaperWork:/System/Applications/PaperWork.app \ - :/Useless \ - Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo + Source/Applications/Shell/Shell:/Shell.app \ + Source/Applications/Shell/Help.txt:/Shell-Help.txt \ + Source/Applications/Shell/Applets/rot13:/rot13 \ + Source/Kernel/Ressources/Graphics/logo.text.cxd:/Melon-logo Files = $(Kernel) $(RamFS) Floppy = Melon.img |