diff --git a/src/bin/init/Makefile b/src/bin/init/Makefile index e734202..77a380e 100755 --- a/src/bin/init/Makefile +++ b/src/bin/init/Makefile @@ -1,15 +1,18 @@ # $Id$ -# Kernel Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002 The UbixOS Project #Compiler GCC = gcc G++ = gcc +#Compiler Flags +CFLAGS = -I../../lib/libc/include + #Linker LD = ld -#Kernel File Name +#Binary File Name BINARY = init #Delete Program @@ -18,26 +21,32 @@ #Objects OBJS = main.o -# Link the kernel statically with fixed text+data address @1M +#Libraries +LIBRARIES = ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o + +#Startup File +STARTUP = ../../lib/ubix/startup.o + +# Link The Binary $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o $(OBJS) + $(GCC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) # Compile the source files .cc.o: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -c -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< .cc.s: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .c.o: - $(GCC) -Wall -O -I../../lib/libc/include -c -o $@ $< + $(GCC) -Wall -O $(CFLAGS) -c -o $@ $< .c.s: - $(GCC) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(GCC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .S.o: $(GCC) -Wall -fomit-frame-pointer -c -o $@ $< -# Clean up the junk +# Clean Up The junk clean: $(REMOVE) $(OBJS) $(BINARY) diff --git a/src/bin/init/main.c b/src/bin/init/main.c index 8eb77ec..e6cf0b2 100755 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -26,12 +26,6 @@ #include #include -int main(); - -void _start() { - main(); - } - int main() { int i=0; i = getpid(); @@ -45,4 +39,4 @@ printf("Error Starting Shell\n"); } exit(1); - } \ No newline at end of file + } diff --git a/src/bin/ls/Makefile b/src/bin/ls/Makefile index fcfdfa6..869e508 100755 --- a/src/bin/ls/Makefile +++ b/src/bin/ls/Makefile @@ -1,15 +1,18 @@ # $Id$ -# Kernel Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002 The UbixOS Project #Compiler -GCC = gcc +GCC = gcc G++ = gcc +#Compiler Flags +CFLAGS = -I../../lib/libc/include + #Linker LD = ld -#Kernel File Name +#Binary File Name BINARY = ls #Delete Program @@ -18,26 +21,32 @@ #Objects OBJS = main.o -# Link the kernel statically with fixed text+data address @1M +#Libraries +LIBRARIES = ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o + +#Startup File +STARTUP = ../../lib/ubix/startup.o + +# Link The Binary $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) ../../lib/libc/string/*.o + $(GCC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) # Compile the source files .cc.o: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -c -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< .cc.s: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .c.o: - $(GCC) -Wall -O -I../../lib/libc/include -c -o $@ $< + $(GCC) -Wall -O $(CFLAGS) -c -o $@ $< .c.s: - $(GCC) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(GCC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .S.o: $(GCC) -Wall -fomit-frame-pointer -c -o $@ $< -# Clean up the junk +# Clean Up The junk clean: $(REMOVE) $(OBJS) $(BINARY) diff --git a/src/bin/ls/main.c b/src/bin/ls/main.c index 2e7c833..35b6cbe 100755 --- a/src/bin/ls/main.c +++ b/src/bin/ls/main.c @@ -21,14 +21,8 @@ **************************************************************************************/ -int main(); - #include -void _start() { - main(); - } - int main() { exit(1); } diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index 462dcff..aadef74 100755 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -1,15 +1,18 @@ # $Id$ -# Kernel Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002 The UbixOS Project #Compiler -GCC = gcc +GCC = gcc G++ = gcc +#Compiler Flags +CFLAGS = -I../../lib/libc/include + #Linker LD = ld -#Kernel File Name +#Binary File Name BINARY = shell #Delete Program @@ -18,26 +21,32 @@ #Objects OBJS = main.o -# Link the kernel statically with fixed text+data address @1M +#Libraries +LIBRARIES = ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o + +#Startup File +STARTUP = ../../lib/ubix/startup.o + +# Link The Binary $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o $(OBJS) #-Ttext 0x08048000 #-Ttext 0x1200000 + $(GCC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) # Compile the source files .cc.o: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -c -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< .cc.s: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .c.o: - $(GCC) -Wall -O -I../../lib/libc/include -c -o $@ $< + $(GCC) -Wall -O $(CFLAGS) -c -o $@ $< .c.s: - $(GCC) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(GCC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .S.o: $(GCC) -Wall -fomit-frame-pointer -c -o $@ $< -# Clean up the junk +# Clean Up The junk clean: $(REMOVE) $(OBJS) $(BINARY) diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 342539c..0dc455a 100755 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -21,16 +21,10 @@ **************************************************************************************/ -int main(); - #include #include #include -void _start() { - main(); - } - struct currentInfo { char pwd[256]; }; diff --git a/src/bin/test/Makefile b/src/bin/test/Makefile index 02e3eb9..0c87148 100755 --- a/src/bin/test/Makefile +++ b/src/bin/test/Makefile @@ -1,15 +1,18 @@ # $Id$ -# Kernel Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002 The UbixOS Project #Compiler -GCC = gcc +GCC = gcc G++ = gcc +#Compiler Flags +CFLAGS = -I../../lib/libc/include + #Linker LD = ld -#Kernel File Name +#Binary File Name BINARY = test #Delete Program @@ -18,26 +21,32 @@ #Objects OBJS = main.o -# Link the kernel statically with fixed text+data address @1M +#Libraries +LIBRARIES = ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o + +#Startup File +STARTUP = ../../lib/ubix/startup.o + +# Link The Binary $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) ../../lib/libc/string/*.o + $(GCC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) # Compile the source files .cc.o: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -c -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< .cc.s: - $(G++) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(G++) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .c.o: - $(GCC) -Wall -O -I../../lib/libc/include -c -o $@ $< + $(GCC) -Wall -O $(CFLAGS) -c -o $@ $< .c.s: - $(GCC) -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $< + $(GCC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< .S.o: $(GCC) -Wall -fomit-frame-pointer -c -o $@ $< -# Clean up the junk +# Clean Up The junk clean: $(REMOVE) $(OBJS) $(BINARY) diff --git a/src/bin/test/main.c b/src/bin/test/main.c index 2d77ee5..2abace5 100755 --- a/src/bin/test/main.c +++ b/src/bin/test/main.c @@ -21,16 +21,10 @@ **************************************************************************************/ -int main(); - #include #include #include -void _start() { - main(); - } - int main() { int i = 0,x = 0,cPid = 0; printf("This Is A Test Program\n");