Changeset 83b64a59 in mainline for uspace/Makefile

Timestamp:

2019-06-05T16:03:03Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b401b33

Parents:

58168e0

Message:

Minor cleanup of uspace makefiles

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -223 +223 @@
 #
 
-BASE_LIBS = \
-        lib/c \
-        lib/cpp
-
-LIBS = \
+DIRS += \
         lib/fs \
         lib/block \
+        lib/c \
+        lib/cpp \
         lib/crypto \
         lib/clui \
@@ -266 +264 @@
         lib/virtio
 
-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
+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
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(BASE_BUILDS) $(BUILDS)
+$(BUILDS_TESTS): $(BUILDS)
         $(MAKE) -r -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
@@ -292 +289 @@
         -$(MAKE) -r -C $(basename $@) fasterclean
 
-$(BASE_BUILDS) $(BUILDS):
+$(BUILDS):
         $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
 
@@ -298 +295 @@
         $(MAKE) -r -C $(@D) deps.mk SELF_TARGET="$(@D).build"
 
-$(BUILDS): $(BASE_BUILDS)
-
 -include $(DEPS)