diff options
Diffstat (limited to 'userland')
| -rw-r--r-- | userland/json/Makefile | 8 | ||||
| -rw-r--r-- | userland/libc/Makefile | 12 | ||||
| -rw-r--r-- | userland/libgui/Makefile | 5 | ||||
| -rw-r--r-- | userland/minibox/Makefile | 2 | ||||
| -rw-r--r-- | userland/sh/Makefile | 2 | ||||
| -rw-r--r-- | userland/snake/Makefile | 2 | ||||
| -rw-r--r-- | userland/terminal/Makefile | 2 | ||||
| -rw-r--r-- | userland/test/Makefile | 3 | ||||
| -rw-r--r-- | userland/windowserver/Makefile | 2 |
9 files changed, 17 insertions, 21 deletions
diff --git a/userland/json/Makefile b/userland/json/Makefile index 9fcb567..3a6bc90 100644 --- a/userland/json/Makefile +++ b/userland/json/Makefile @@ -1,8 +1,6 @@ -#CC="/home/anton/opt/cross/bin/i686-elf-gcc" -#AR="/home/anton/opt/cross/bin/i686-elf-ar" -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" -AR="/home/anton/prj/osdev/sysroot/bin/i686-sb-ar" -CFLAGS = -O0 -Wall -Wextra -pedantic -Wimplicit-fallthrough -static -Wno-undef +CC="i686-sb-gcc" +AR="i686-sb-ar" +CFLAGS = -O2 -Wall -Wextra -pedantic -Wimplicit-fallthrough -static -Wno-undef BINS=libjson.a all: $(BINS) LIBS=-L./hashmap -lhashmap diff --git a/userland/libc/Makefile b/userland/libc/Makefile index 98d81d4..18c80fa 100644 --- a/userland/libc/Makefile +++ b/userland/libc/Makefile @@ -1,6 +1,6 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" -AR="/home/anton/prj/osdev/sysroot/bin/i686-sb-ar" -AS="/home/anton/prj/osdev/sysroot/bin/i686-sb-as" +CC="i686-sb-gcc" +AR="i686-sb-ar" +AS="i686-sb-as" #CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -I./include/ -static -fsanitize=shift,signed-integer-overflow,bounds CFLAGS = -ggdb -ffreestanding -O2 -Wall -pedantic -Wimplicit-fallthrough -I./include/ -static #BINS=c.a libc.o crt0.o malloc.o pty.o mmap.o @@ -18,9 +18,9 @@ libc.a: $(OBJ) $(AR) rcs libc.a $(OBJ) install: - cp crt0.o /home/anton/prj/osdev/sysroot/lib/ - cp libc.a /home/anton/prj/osdev/sysroot/lib/ - cp -r include /home/anton/prj/osdev/sysroot/usr/ + cp crt0.o ../../sysroot/lib/ + cp libc.a ../../sysroot/lib/ + cp -r include ../../sysroot/usr/ clean: rm libc.a *.o */*.o */*/*.o diff --git a/userland/libgui/Makefile b/userland/libgui/Makefile index 5a895c4..584fda6 100644 --- a/userland/libgui/Makefile +++ b/userland/libgui/Makefile @@ -1,6 +1,5 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" -AR="/home/anton/prj/osdev/sysroot/bin/i686-sb-ar" -#CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -nostdlib -static -Wno-undef -fsanitize=shift,signed-integer-overflow,bounds +CC="i686-sb-gcc" +AR="i686-sb-ar" CFLAGS = -O2 -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -nostdlib -static -Wno-undef BINS=libgui.a all: $(BINS) diff --git a/userland/minibox/Makefile b/userland/minibox/Makefile index 5448f96..9e34357 100644 --- a/userland/minibox/Makefile +++ b/userland/minibox/Makefile @@ -1,4 +1,4 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS=-Wall -Wextra -pedantic -Wimplicit-fallthrough -g -O0 OBJ=minibox.o utilities/cat.o utilities/echo.o utilities/yes.o utilities/minibox.o utilities/ascii.o utilities/wc.o utilities/init.o utilities/ls.o utilities/touch.o utilities/ed.o diff --git a/userland/sh/Makefile b/userland/sh/Makefile index adccfb3..3e82b9e 100644 --- a/userland/sh/Makefile +++ b/userland/sh/Makefile @@ -1,4 +1,4 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -fsanitize=shift,signed-integer-overflow,bounds BINS=sh all: $(BINS) diff --git a/userland/snake/Makefile b/userland/snake/Makefile index f29df30..19cf3fe 100644 --- a/userland/snake/Makefile +++ b/userland/snake/Makefile @@ -1,4 +1,4 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -static -fsanitize=shift,signed-integer-overflow,bounds LIB=-L../libgui -lgui -L../json -ljson -L../libc -lc -lgcc INC=-I../libc/ -I../json/ -I../libgui/ diff --git a/userland/terminal/Makefile b/userland/terminal/Makefile index 330f6e0..d88aba6 100644 --- a/userland/terminal/Makefile +++ b/userland/terminal/Makefile @@ -1,4 +1,4 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS = -ggdb -ffreestanding -O0 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -static -fsanitize=shift,signed-integer-overflow,bounds LIB=-L../libgui -lgui -L../json -ljson -L../libc -lc -lgcc INC=-I../libc/ -I../json/ -I../libgui/ diff --git a/userland/test/Makefile b/userland/test/Makefile index 7287939..0e3b495 100644 --- a/userland/test/Makefile +++ b/userland/test/Makefile @@ -1,5 +1,4 @@ -#CC="/home/anton/opt/cross/bin/i686-elf-gcc" -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS = -O2 -Wall -Wextra -pedantic -Wimplicit-fallthrough -static LIB=-L../json -L../json/hashmap -ljson -lhashmap INC=-I../json/ diff --git a/userland/windowserver/Makefile b/userland/windowserver/Makefile index f67bd66..65a50f6 100644 --- a/userland/windowserver/Makefile +++ b/userland/windowserver/Makefile @@ -1,4 +1,4 @@ -CC="/home/anton/prj/osdev/sysroot/bin/i686-sb-gcc" +CC="i686-sb-gcc" CFLAGS = -ggdb -ffreestanding -O2 -Wall -Wextra -pedantic -mgeneral-regs-only -Wimplicit-fallthrough -fsanitize=shift,signed-integer-overflow,bounds BIN=ws LIB=-L../json -ljson -L../json/hashmap -lhashmap -L../libc -lc -lgcc |