diff --git a/src/bin/Makefile b/src/bin/Makefile index be93112..9a3589e 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -1,7 +1,7 @@ # $Id$ # The System Makefile (C) 2002 The UbixOS Project -all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin launcher-bin ubistry-bin +all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin # test-bin pwd-bin cat-bin ld-dyn-bin de-bin goofball-bin init-bin: init diff --git a/src/bin/Makefile.inc b/src/bin/Makefile.inc index 2dcd501..e87d490 100644 --- a/src/bin/Makefile.inc +++ b/src/bin/Makefile.inc @@ -1,5 +1,7 @@ # 'bin' options -CFLAGS = -fno-builtin -I../../include #-I../../lib/libc/include -fno-builtin +CFLAGS = -fno-builtin -nostdlib -nostdinc + +INCLUDES = -I../../include LIBRARIES = ../../lib/libc/math/*.o ../../lib/libc/quad/*.o ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o ../../lib/libc/string/*.o ../../lib/libc/locale/*.o ../../lib/libc/gen/*.o ../../lib/libc/generic/*.o diff --git a/src/bin/clock/Makefile b/src/bin/clock/Makefile index fbe07ad..4aa5a59 100644 --- a/src/bin/clock/Makefile +++ b/src/bin/clock/Makefile @@ -3,9 +3,7 @@ # Include Global 'Source' Options include ../../Makefile.inc - -#Compiler Flags -CFLAGS = -I../../include -fno-builtin +include ../Makefile.inc #Linker LD = ld @@ -19,33 +17,32 @@ #Objects OBJS = main.o -#Libraries -LIBRARIES = ../../lib/libc/libc.so -#LIBRARIES = ../../lib/libc/locale/*.o ../../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) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/cp/Makefile b/src/bin/cp/Makefile index 795d5b0..8cf5d52 100644 --- a/src/bin/cp/Makefile +++ b/src/bin/cp/Makefile @@ -5,8 +5,14 @@ include ../../Makefile.inc include ../Makefile.inc +#Linker +LD = ld + #Binary File Name -BINARY = cp +BINARY = cp + +#Delete Program +REMOVE = rm -f #Objects OBJS = main.o @@ -16,24 +22,24 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/disklabel/Makefile b/src/bin/disklabel/Makefile index aa79d53..079567c 100644 --- a/src/bin/disklabel/Makefile +++ b/src/bin/disklabel/Makefile @@ -5,14 +5,11 @@ include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin - #Linker LD = ld #Binary File Name -BINARY = disklabel +BINARY = disklabel #Delete Program REMOVE = rm -f @@ -25,24 +22,24 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/disklabel/main.c b/src/bin/disklabel/main.c index a7ab017..0567b1d 100644 --- a/src/bin/disklabel/main.c +++ b/src/bin/disklabel/main.c @@ -60,19 +60,19 @@ i = atoi(argv[2]); printf("d->partitions[%i].p_size = %i, ",i,d->partitions[i].p_size); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d->partitions[i].p_size = atoi(buf); printf("d->partitions[%i].p_offset = %i, ",i,d->partitions[i].p_offset); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d->partitions[i].p_offset = atoi(buf); printf("d->partitions[%i].p_fstype = %i, ",i,d->partitions[i].p_fstype); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d->partitions[i].p_fstype = atoi(buf); printf("d->partitions[%i].p_bsize = %i, ",i,d->partitions[i].p_bsize); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d->partitions[i].p_bsize = atoi(buf); printf("\n"); printf("d->partitions[%i].p_size = %i\n",i,d->partitions[i].p_size); @@ -95,11 +95,14 @@ fclose(fd); - exit(0); + return(0); } /*** $Log$ + Revision 1.2 2004/05/24 13:42:29 reddawg + Clean Up + END ***/ diff --git a/src/bin/fdisk/Makefile b/src/bin/fdisk/Makefile index cc26596..7203937 100644 --- a/src/bin/fdisk/Makefile +++ b/src/bin/fdisk/Makefile @@ -5,9 +5,6 @@ include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin - #Linker LD = ld @@ -25,24 +22,24 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/fdisk/main.c b/src/bin/fdisk/main.c index 00c206d..9d43de1 100644 --- a/src/bin/fdisk/main.c +++ b/src/bin/fdisk/main.c @@ -85,15 +85,15 @@ i--; printf("d[%i].dp_type = %i, ",i,d[i].dp_type); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d[i].dp_type = atoi(buf); printf("d[%i].dp_start: %i, ",i,d[i].dp_start); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d[i].dp_start = atoi(buf); printf("d[%i].dp_size: %i, ",i,d[i].dp_size); printf("New Value: "); - gets(&buf); + gets((char *)&buf); d[i].dp_size = atoi(buf); printf("d[%i].dp_type: 0x%X\n",i,d[i].dp_type); printf("d[%i].dp_start: %i\n",i,d[i].dp_start); @@ -114,11 +114,14 @@ fclose(fd); - exit(0); + return(0); } /*** $Log$ + Revision 1.7 2004/05/24 13:54:52 reddawg + Clean Up + END ***/ diff --git a/src/bin/format/Makefile b/src/bin/format/Makefile index 273e8c0..0fcf67e 100644 --- a/src/bin/format/Makefile +++ b/src/bin/format/Makefile @@ -1,13 +1,10 @@ # $Id$ -# Application Makefile (c) 2002-2004 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin - #Linker LD = ld @@ -25,24 +22,24 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/format/main.c b/src/bin/format/main.c index 379146b..acc2aa1 100644 --- a/src/bin/format/main.c +++ b/src/bin/format/main.c @@ -36,11 +36,14 @@ int main(int argc,char **argv) { printf("UbixOS Format V1.0\n"); - exit(0); + return(0); } /*** $Log$ + Revision 1.3 2004/05/24 14:09:20 reddawg + Clean Up + END ***/ diff --git a/src/bin/init/Makefile b/src/bin/init/Makefile index 9bc4660..87eaa45 100644 --- a/src/bin/init/Makefile +++ b/src/bin/init/Makefile @@ -1,13 +1,19 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc +#Linker +LD = ld + #Binary File Name BINARY = init +#Delete Program +REMOVE = rm -f + #Objects OBJS = main.o @@ -16,24 +22,24 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o ${CFLAGS} $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile index 3bd4afb..fb1d570 100644 --- a/src/bin/launcher/Makefile +++ b/src/bin/launcher/Makefile @@ -1,12 +1,11 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -DNOBOOL -fno-builtin -fno-exceptions +INCLUDES += -I./include -I../../lib/views/sunlight/include #Linker LD = ld @@ -20,38 +19,32 @@ #Objects OBJS = launcher.o ubixButton.o ubixDesktop.o -#Libraries -LIBRARIES2 = ../../lib/objgfx40/*.o ../../lib/libcpp/*.o ../../lib/views/sunlight/*.o ../../lib/libstdc++/*.o - -#Include -INCLUDE = -I../../lib/libc/include -I../../lib/libcpp/include -I../../lib/objgfx40/objgfx40 -I../../lib/views/sunlight/include -I./include - #Startup File STARTUP = ../../lib/ubix/startup.o # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(LIBRARIES2) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files .cpp.o: - $(CXX) -Wall -nostdlib -fomit-frame-pointer -O $(CFLAGS) $(INCLUDE) -c -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) $(INCLUDE) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) $(INCLUDE) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) $(INCLUDE) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) $(INCLUDE) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer $(INCLUDE) -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/ld/Makefile b/src/bin/ld/Makefile index 7118486..71b8e65 100644 --- a/src/bin/ld/Makefile +++ b/src/bin/ld/Makefile @@ -1,18 +1,15 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin - #Linker LD = ld #Binary File Name -BINARY = ld +BINARY = ld #Delete Program REMOVE = rm -f @@ -25,24 +22,27 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/ld/main.c b/src/bin/ld/main.c index 941725a..8787ee5 100644 --- a/src/bin/ld/main.c +++ b/src/bin/ld/main.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.1 2004/04/26 21:16:03 reddawg + Initial addition of the ubix LD + Revision 1.2 2004/04/26 13:20:42 reddawg Turn off muffin @@ -43,7 +46,7 @@ int main(int argc,char **argv) { - exit(0); + return(0); } /*** diff --git a/src/bin/login/Makefile b/src/bin/login/Makefile index 6557744..fba87bb 100644 --- a/src/bin/login/Makefile +++ b/src/bin/login/Makefile @@ -1,13 +1,19 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc +#Linker +LD = ld + #Binary File Name BINARY = login +#Delete Program +REMOVE = rm -f + #Objects OBJS = main.o @@ -16,24 +22,27 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/ls/Makefile b/src/bin/ls/Makefile index af8cca9..3cfde47 100644 --- a/src/bin/ls/Makefile +++ b/src/bin/ls/Makefile @@ -1,13 +1,10 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -fno-builtin - #Linker LD = ld @@ -25,24 +22,27 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/muffin/Makefile b/src/bin/muffin/Makefile index e64da40..5e18ab5 100644 --- a/src/bin/muffin/Makefile +++ b/src/bin/muffin/Makefile @@ -6,7 +6,7 @@ include ../Makefile.inc #Compiler Flags -CFLAGS = -DNOBOOL -fno-builtin -fno-rtti -fno-exceptions +CFLAGS = -DNOBOOL -fno-builtin -fno-exceptions -nostdlib -nostdinc #Linker LD = ld @@ -31,7 +31,7 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(LIBRARIES2) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(LIBRARIES2) $(OBJS) strip $(BINARY) # Compile the source files diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index a571989..955a664 100644 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -1,13 +1,10 @@ # $Id$ -# Application Makefile (C) 2002 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -fno-builtin - #Linker LD = ld @@ -25,24 +22,27 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/shell/commands.c b/src/bin/shell/commands.c index c3a4cd2..b8420fd 100644 --- a/src/bin/shell/commands.c +++ b/src/bin/shell/commands.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include "shell.h" diff --git a/src/bin/shell/exec.c b/src/bin/shell/exec.c index c583f5b..8877b66 100644 --- a/src/bin/shell/exec.c +++ b/src/bin/shell/exec.c @@ -22,13 +22,12 @@ **************************************************************************************/ #include +#include #include #include #include #include "shell.h" -void sched_yield(); - void execProgram(inputBuffer *data) { int cPid = 0x0; cPid = fork(); diff --git a/src/bin/ubistry/Makefile b/src/bin/ubistry/Makefile index 9c1e605..a2257ea 100644 --- a/src/bin/ubistry/Makefile +++ b/src/bin/ubistry/Makefile @@ -1,13 +1,10 @@ # $Id$ -# Application Makefile (c) 2002-2004 The UbixOS Project +# Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options include ../../Makefile.inc include ../Makefile.inc -#Compiler Flags -CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin - #Linker LD = ld @@ -25,24 +22,27 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files +.cpp.o: + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.o: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $< - + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< + .cc.s: - $(CXX) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) -Wall -O $(CFLAGS) -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $< # Clean Up The junk clean: diff --git a/src/bin/ubistry/main.c b/src/bin/ubistry/main.c index dc8a5cf..20fe226 100644 --- a/src/bin/ubistry/main.c +++ b/src/bin/ubistry/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "./include/ubistry.h" int main(int argc,char **argv) { @@ -55,6 +56,10 @@ /*** $Log$ + Revision 1.4 2004/05/26 15:41:20 reddawg + ubistry: added command 666 which will restart the registry server also added + command 51 to add a key format key,value + Revision 1.3 2004/05/26 13:10:39 reddawg ubistry: added two functions ubistryFindKey(char *name) <- Will find key with specified name diff --git a/src/bin/views/Makefile b/src/bin/views/Makefile index 654f73a..363704c 100644 --- a/src/bin/views/Makefile +++ b/src/bin/views/Makefile @@ -5,7 +5,7 @@ include ../../Makefile.inc #Compiler Flags -CFLAGS = -I../../lib/libc/include -fno-builtin +CFLAGS = -I../../lib/libc/include -fno-builtin -nostdlib -nostdinc #Linker LD = ld @@ -28,7 +28,7 @@ # Link The Binary $(BINARY) : $(OBJS) - $(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) + $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) strip $(BINARY) # Compile the source files