summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-11-08 12:58:27 +0100
committerAlexis211 <alexis211@gmail.com>2009-11-08 12:58:27 +0100
commitec6a6922d074da4b64976282333e308deb39aeec (patch)
tree60d5e4a63095af75fc3ddae38021fa4c92ffd361 /Makefile
parent962b8e892ce060b9690a35b0bcf6bae9a882c330 (diff)
downloadMelon-ec6a6922d074da4b64976282333e308deb39aeec.tar.gz
Melon-ec6a6922d074da4b64976282333e308deb39aeec.zip
Introduced PaperWork : our init/login manager.
Login with user=root;pass=admin or user=alexis211;pass=iamgod
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4a3e732..fab9eae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
.PHONY: clean, mrproper, Init.rfs, commit
-Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/SampleApps
+Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/PaperWork Applications/SampleApps
Kernel = Source/Kernel/Melon.ke
RamFS = Init.rfs
@@ -14,6 +14,7 @@ RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keym
Source/Applications/SampleApps/cxxdemo:/Applications/Demos/CPPDemo.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
@@ -55,7 +56,7 @@ $(RamFS):
Source/Tools/MakeRamFS/MakeRamFS $(RamFS) $(RamFSFiles)
floppy: $(Files)
- mkdir Mount
+ mkdir Mount; exit 0
sudo mount $(Floppy) Mount -o loop
sudo cp Grub-menu.cfg Mount/boot/menu.cfg
for f in $(Files); do \
@@ -76,7 +77,7 @@ qemu_debug:
stats:
echo; echo " ** Statistics for project O3S ** "; \
echo -n "Lines of code : "; \
- cat Source/*/{*,*/*,*/*/*}.{c,asm,cpp,h} 2> /dev/null | wc -l; \
+ cat Source/*/{*,*/*,*/*/*,*/*/*/*}.{c,asm,cpp,h} 2> /dev/null | wc -l; \
echo "TODOs : "; \
- git grep TODO
+ git grep TODO \
#cat Source/*/{*,*/*,*/*/*}.{c,asm,cpp,h} 2> /dev/null | grep TODO;