=== modified file 'uspace/Makefile'
--- uspace/Makefile	2014-12-22 17:47:40 +0000
+++ uspace/Makefile	2015-02-16 15:51:08 +0000
@@ -255,7 +255,7 @@
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BUILDS)
+$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
 	$(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
 clean: $(CLEANS)

=== modified file 'uspace/Makefile.common'
--- uspace/Makefile.common	2014-12-22 17:47:40 +0000
+++ uspace/Makefile.common	2015-02-17 08:23:02 +0000
@@ -179,7 +179,7 @@
 endif
 
 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)
 		BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
@@ -314,7 +314,10 @@
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
+
+ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
+endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
@@ -354,12 +357,12 @@
 endif
 
 ifneq ($(LIBRARY),)
-%.a: $(OBJECTS)
+$(LIBRARY).a: $(OBJECTS)
 	$(AR) rc $@ $(OBJECTS)
 endif
 
 ifneq ($(SLIBRARY),)
-%.la: $(LOBJECTS)
+$(SLIBRARY).la: $(LOBJECTS)
 	$(AR) rc $@ $(LOBJECTS)
 endif
 

=== modified file 'uspace/app/barber/Makefile'
--- uspace/app/barber/Makefile	2014-11-13 00:27:06 +0000
+++ uspace/app/barber/Makefile	2015-02-16 15:44:57 +0000
@@ -84,5 +84,5 @@
 
 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)

=== modified file 'uspace/lib/c/Makefile'
--- uspace/lib/c/Makefile	2014-10-09 15:03:55 +0000
+++ uspace/lib/c/Makefile	2015-02-17 08:28:10 +0000
@@ -46,7 +46,6 @@
 SLIBRARY = libc.so.0.0
 LSONAME = libc.so0
 
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
 
 -include $(CONFIG_MAKEFILE)

=== modified file 'uspace/lib/ext4/Makefile'
--- uspace/lib/ext4/Makefile	2012-08-12 18:36:10 +0000
+++ uspace/lib/ext4/Makefile	2015-02-17 08:27:59 +0000
@@ -29,7 +29,6 @@
 USPACE_PREFIX = ../..
 LIBRARY = libext4
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 
 SOURCES = \
 	libext4_balloc.c \

=== modified file 'uspace/lib/nic/Makefile'
--- uspace/lib/nic/Makefile	2013-12-31 20:13:27 +0000
+++ uspace/lib/nic/Makefile	2015-02-17 08:27:55 +0000
@@ -29,7 +29,6 @@
 USPACE_PREFIX = ../..
 LIBRARY = libnic
 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
 
 SOURCES = \
 	src/nic_driver.c \

=== modified file 'uspace/lib/pcut/Makefile'
--- uspace/lib/pcut/Makefile	2014-09-19 08:23:01 +0000
+++ uspace/lib/pcut/Makefile	2015-02-16 11:40:59 +0000
@@ -5,7 +5,7 @@
 USPACE_PREFIX = ../..
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 	$(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
 	$(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
 	$(PCUT_TEST_PREFIX)beforeafter$(PCUT_TEST_SUFFIX) \
@@ -24,12 +24,16 @@
 	$(PCUT_TEST_PREFIX)timeout$(PCUT_TEST_SUFFIX) \
 	$(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX) 
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
 include $(USPACE_PREFIX)/Makefile.common
 
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
 	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
 

=== modified file 'uspace/lib/pcut/update-from-master.sh'
--- uspace/lib/pcut/update-from-master.sh	2014-09-19 08:23:01 +0000
+++ uspace/lib/pcut/update-from-master.sh	2015-02-16 11:14:09 +0000
@@ -58,7 +58,7 @@
 USPACE_PREFIX = ../..
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 EOF_MAKEFILE_HEAD
 
 for testfile in tests/*.expected; do
@@ -68,12 +68,16 @@
 
 cat >>Makefile <<'EOF_MAKEFILE_TAIL'
 
+EXTRA_CLEAN = $(SELF_TESTS)
+
 include helenos.mak
 
 include $(USPACE_PREFIX)/Makefile.common
 
 include helenos.test.mak
 
+all-test: $(SELF_TESTS)
+
 test-libpcut-%: $(OUTPUT)
 	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
 

=== modified file 'uspace/lib/urcu/Makefile'
--- uspace/lib/urcu/Makefile	2012-11-22 21:26:08 +0000
+++ uspace/lib/urcu/Makefile	2015-02-17 08:27:46 +0000
@@ -28,8 +28,6 @@
 
 USPACE_PREFIX = ../..
 
-LIBS = $(LIBC_PREFIX)/libc.a 
-
 EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include
 
 LIBRARY = liburcu