Ticket #619: partial_and_parallel_builds.patch

uspace/Makefile

@@ -255 +255 @@
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BUILDS)
+$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
         $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
 clean: $(CLEANS)

uspace/Makefile.common

@@ -179 +179 @@
 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 +314 @@
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
+
+ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
+endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
@@ -354 +357 @@
 endif
 
 ifneq ($(LIBRARY),)
-%.a: $(OBJECTS)
+$(LIBRARY).a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
 endif
 
 ifneq ($(SLIBRARY),)
-%.la: $(LOBJECTS)
+$(SLIBRARY).la: $(LOBJECTS)
         $(AR) rc $@ $(LOBJECTS)
 endif
 

uspace/app/barber/Makefile

@@ -84 +84 @@
 
 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)

uspace/lib/c/Makefile

@@ -46 +46 @@
 SLIBRARY = libc.so.0.0
 LSONAME = libc.so0
 
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
 EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
 
 -include $(CONFIG_MAKEFILE)

uspace/lib/ext4/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libext4
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 
 SOURCES = \
         libext4_balloc.c \

uspace/lib/nic/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libnic
 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
 
 SOURCES = \
         src/nic_driver.c \

uspace/lib/pcut/Makefile

@@ -5 +5 @@
 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 +24 @@
         $(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)
 

uspace/lib/pcut/update-from-master.sh

@@ -58 +58 @@
 USPACE_PREFIX = ../..
 PCUT_TEST_PREFIX = test-libpcut-
 
-EXTRA_OUTPUT = \
+SELF_TESTS = \
 EOF_MAKEFILE_HEAD
 
 for testfile in tests/*.expected; do
@@ -68 +68 @@
 
 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)
 

uspace/lib/urcu/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
 
-LIBS = $(LIBC_PREFIX)/libc.a 
-
 EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include
 
 LIBRARY = liburcu