Index: uspace/lib/softfloat/Makefile
===================================================================
--- uspace/lib/softfloat/Makefile	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ uspace/lib/softfloat/Makefile	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -30,7 +30,6 @@
 #
 
--include ../../../Makefile.config
+LIBC_PREFIX = ../libc
 
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
@@ -38,18 +37,18 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
 
 ## Sources
 #
 
-GENERIC_SOURCES =		\
-	generic/add.c		\
-	generic/common.c	\
-	generic/comparison.c	\
-	generic/conversion.c	\
-	generic/div.c		\
-	generic/mul.c		\
-	generic/other.c		\
-	generic/softfloat.c	\
+GENERIC_SOURCES = \
+	generic/add.c \
+	generic/common.c \
+	generic/comparison.c \
+	generic/conversion.c \
+	generic/div.c \
+	generic/mul.c \
+	generic/other.c \
+	generic/softfloat.c \
 	generic/sub.c
 
@@ -69,5 +68,5 @@
 
 depend:
-	-makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+	-makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)