diff --git a/src/bin/Makefile.inc b/src/bin/Makefile.inc index c0d449f..8f7dae0 100644 --- a/src/bin/Makefile.inc +++ b/src/bin/Makefile.inc @@ -1,7 +1,9 @@ # 'bin' options -CFLAGS = -nostdlib -nostdinc -fomit-frame-pointer -fno-builtin +CFLAGS = -nostdlib -nostdinc -fno-builtin INCLUDES = -I../../include LIBRARIES = ../../lib/libc_old/math/*.o ../../lib/libc_old/quad/*.o ../../lib/libc_old/stdio/*.o ../../lib/libc_old/stdlib/*.o ../../lib/libc_old/sys/*.o ../../lib/libc_old/string/*.o ../../lib/libc_old/locale/*.o ../../lib/libc_old/gen/*.o ../../lib/libc_old/generic/*.o + +STARTUP = ../../lib/ubix/*.o diff --git a/src/bin/clock/Makefile b/src/bin/clock/Makefile index 4c30541..00f6bc5 100644 --- a/src/bin/clock/Makefile +++ b/src/bin/clock/Makefile @@ -17,10 +17,7 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - -#LIBRARIES = ../../lib/libc_old/libc_old.so +LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary $(BINARY) : $(OBJS) diff --git a/src/bin/cp/Makefile b/src/bin/cp/Makefile index 8271b82..9a4b19d 100644 --- a/src/bin/cp/Makefile +++ b/src/bin/cp/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/disklabel/Makefile b/src/bin/disklabel/Makefile index 9d52209..427a0c3 100644 --- a/src/bin/disklabel/Makefile +++ b/src/bin/disklabel/Makefile @@ -17,10 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/edit/Makefile b/src/bin/edit/Makefile index 6779c67..190abb4 100644 --- a/src/bin/edit/Makefile +++ b/src/bin/edit/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/fdisk/Makefile b/src/bin/fdisk/Makefile index ed3c040..0f7b18c 100644 --- a/src/bin/fdisk/Makefile +++ b/src/bin/fdisk/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/format/Makefile b/src/bin/format/Makefile index d7e4329..f27ed98 100644 --- a/src/bin/format/Makefile +++ b/src/bin/format/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIIES = ../../lib/libc/libc.so # Link The Binary diff --git a/src/bin/init/Makefile b/src/bin/init/Makefile index 2e8e490..7cdfc87 100644 --- a/src/bin/init/Makefile +++ b/src/bin/init/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - #LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile index 78193bd..eca7b66 100644 --- a/src/bin/launcher/Makefile +++ b/src/bin/launcher/Makefile @@ -21,9 +21,6 @@ #Objects OBJS = launcher.o ubixButton.o ubixDesktop.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - # Link The Binary $(BINARY) : $(OBJS) $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS) diff --git a/src/bin/ld/Makefile b/src/bin/ld/Makefile index b52be0a..8038f81 100644 --- a/src/bin/ld/Makefile +++ b/src/bin/ld/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o findlibrary.o findfunc.o addlibrary.o entry.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - # Link The Binary $(OUTPUT) : $(OBJS) $(CC) -nostdlib -shared -Wl,-soname,$(OUTPUT) -e _ld -o $(OUTPUT) $(OBJS) $(LIBRARIES) $(SUBS) diff --git a/src/bin/login/Makefile b/src/bin/login/Makefile index 4e87ee3..5a857d9 100644 --- a/src/bin/login/Makefile +++ b/src/bin/login/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - #LIBRARIES = ../../lib/libc/libc.so # Link The Binary diff --git a/src/bin/ls/Makefile b/src/bin/ls/Makefile index f9f2e02..70dd9a4 100644 --- a/src/bin/ls/Makefile +++ b/src/bin/ls/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/muffin/Makefile b/src/bin/muffin/Makefile index 5e18ab5..25d7562 100644 --- a/src/bin/muffin/Makefile +++ b/src/bin/muffin/Makefile @@ -26,9 +26,6 @@ #Include INCLUDE = -I../../lib/libc/include -I../../lib/libcpp/include -I../../lib/objgfx40 -#Startup File -STARTUP = ../../lib/ubix/startup.o - # Link The Binary $(BINARY) : $(OBJS) $(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(LIBRARIES2) $(OBJS) diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index b85cf44..4efdfa8 100644 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o error.o commands.o exec.o input.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/ttyd/Makefile b/src/bin/ttyd/Makefile index 4464bec..f556214 100644 --- a/src/bin/ttyd/Makefile +++ b/src/bin/ttyd/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/ubistry/Makefile b/src/bin/ubistry/Makefile index b2cd7fd..5240c62 100644 --- a/src/bin/ubistry/Makefile +++ b/src/bin/ubistry/Makefile @@ -17,9 +17,6 @@ #Objects OBJS = db.o message.o main.o -#Startup File -STARTUP = ../../lib/ubix/startup.o - LIBRARIES = ../../lib/libc_old/libc_old.so # Link The Binary diff --git a/src/bin/views/Makefile b/src/bin/views/Makefile index 363704c..bdee55b 100644 --- a/src/bin/views/Makefile +++ b/src/bin/views/Makefile @@ -23,9 +23,6 @@ #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) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)