Changes in uspace/Makefile [83b64a59:69b6dd1f] in mainline

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -223 +223 @@
 #
 
-DIRS += \
+BASE_LIBS = \
+        lib/c \
+        lib/cpp \
+        lib/untar
+
+LIBS = \
         lib/fs \
         lib/block \
-        lib/c \
-        lib/cpp \
         lib/crypto \
         lib/clui \
@@ -250 +253 @@
         lib/ext4 \
         lib/trackmod \
-        lib/untar \
         lib/uri \
         lib/usb \
@@ -264 +266 @@
         lib/virtio
 
-BUILDS := $(addsuffix .build,$(DIRS))
-BUILDS_TESTS := $(addsuffix .build-test,$(DIRS))
-DEPS = $(addsuffix /deps.mk,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS))
-
-.PHONY: all $(BUILDS) $(BUILDS_TESTS) $(CLEANS) clean export
+BASE_BUILDS := $(addsuffix .build,$(BASE_LIBS))
+BUILDS := $(addsuffix .build,$(DIRS) $(LIBS))
+BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) $(BASE_LIBS))
+DEPS = $(addsuffix /deps.mk,$(DIRS) $(LIBS))
+CLEANS := $(addsuffix .clean,$(DIRS) $(LIBS) $(BASE_LIBS))
+
+.PHONY: all $(BASE_BUILDS) $(BUILDS) $(BUILDS_TESTS) $(CLEANS) clean export
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BUILDS)
+$(BUILDS_TESTS): $(BASE_BUILDS) $(BUILDS)
         $(MAKE) -r -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
@@ -289 +292 @@
         -$(MAKE) -r -C $(basename $@) fasterclean
 
-$(BUILDS):
+$(BASE_BUILDS) $(BUILDS):
         $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
 
@@ -295 +298 @@
         $(MAKE) -r -C $(@D) deps.mk SELF_TARGET="$(@D).build"
 
+$(BUILDS): $(BASE_BUILDS)
+
 -include $(DEPS)