Index: uspace/app/fontviewer/Makefile
===================================================================
--- uspace/app/fontviewer/Makefile	(revision a9763c666a17a9e61eed93a67919ee613c7f32a9)
+++ uspace/app/fontviewer/Makefile	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
@@ -29,14 +29,6 @@
 USPACE_PREFIX = ../..
 
-LIBS = \
-	$(LIBGUI_PREFIX)/libgui.a \
-	$(LIBDRAW_PREFIX)/libdraw.a \
-	$(LIBSOFTREND_PREFIX)/libsoftrend.a \
-	$(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-
-EXTRA_CFLAGS += \
-	-I$(LIBGUI_PREFIX) \
-	-I$(LIBDRAW_PREFIX) \
-	-I$(LIBSOFTREND_PREFIX)
+# TODO: Should be just "gui", rest is transitive dependencies.
+LIBS = gui draw softrend compress
 
 BINARY = fontviewer