Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -266,5 +266,5 @@
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BUILDS)
+$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
 	$(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/Makefile.common	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -198,5 +198,5 @@
 
 ifeq ($(STATIC_BUILD),y)
-	BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
+	BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 	LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 	ifeq ($(MATH),y)
@@ -331,5 +331,8 @@
 endif
 
+
+ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
+endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -371,10 +374,10 @@
 
 ifneq ($(LIBRARY),)
-%.a: $(OBJECTS)
+$(LIBRARY).a: $(OBJECTS)
 	$(AR) rc $@ $(OBJECTS)
 endif
 
 ifneq ($(SLIBRARY),)
-%.la: $(LOBJECTS)
+$(SLIBRARY).la: $(LOBJECTS)
 	$(AR) rc $@ $(LOBJECTS)
 endif
Index: uspace/app/barber/Makefile
===================================================================
--- uspace/app/barber/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/app/barber/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -85,4 +85,4 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-images.c images.h: $(IMAGES)
-	$(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^
+image%.c image%.h: $(IMAGES)
+	$(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES)
Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/c/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -47,5 +47,4 @@
 LSONAME = libc.so.0
 
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
 
Index: uspace/lib/ext4/Makefile
===================================================================
--- uspace/lib/ext4/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/ext4/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -30,5 +30,4 @@
 LIBRARY = libext4
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCRYPTO_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCRYPTO_PREFIX)/libcrypto.a
 
 SOURCES = \
Index: uspace/lib/nic/Makefile
===================================================================
--- uspace/lib/nic/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/nic/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -30,5 +30,4 @@
 LIBRARY = libnic
 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
 
 SOURCES = \
Index: uspace/lib/pcut/Makefile
===================================================================
--- uspace/lib/pcut/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/pcut/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -6,5 +6,5 @@
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 	$(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
 	$(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
@@ -25,4 +25,6 @@
 	$(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX) 
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
@@ -31,4 +33,6 @@
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
 	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
Index: uspace/lib/pcut/update-from-master.sh
===================================================================
--- uspace/lib/pcut/update-from-master.sh	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/pcut/update-from-master.sh	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -59,5 +59,5 @@
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 EOF_MAKEFILE_HEAD
 
@@ -69,4 +69,6 @@
 cat >>Makefile <<'EOF_MAKEFILE_TAIL'
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
@@ -75,4 +77,6 @@
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
 	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
Index: uspace/lib/urcu/Makefile
===================================================================
--- uspace/lib/urcu/Makefile	(revision 1cf26abf038d0db4ca5f4e0a43ca1b41d655b01e)
+++ uspace/lib/urcu/Makefile	(revision f6017ee78726b75e8fe397db8ea151608e2148b8)
@@ -29,6 +29,4 @@
 USPACE_PREFIX = ../..
 
-LIBS = $(LIBC_PREFIX)/libc.a 
-
 EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include