Changeset 4f674d7 in mainline

Timestamp:

2017-11-08T23:50:54Z (6 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

25b853c

Parents:

7b884e55

Message:

Build uspace modules in correct dependency order (including dependencies
between libraries).

Location:

uspace

Files:

• Makefile (modified) (4 diffs)
• Makefile.common (modified) (1 diff)

uspace/Makefile

@@ -202 +202 @@
 #
 
-LIBC = lib/c
+BASE_LIBS = \
+        lib/c \
+        lib/softint \
+        lib/softfloat
+
 LIBS = \
         lib/fs \
@@ -213 +217 @@
         lib/scsi \
         lib/compress \
-        lib/softint \
-        lib/softfloat \
         lib/drv \
         lib/graph \
@@ -241 +243 @@
         lib/ieee80211
 
-LIBC_BUILD = $(addsuffix .build,$(LIBC))
-LIBS_BUILD = $(addsuffix .build,$(LIBS))
-BUILDS := $(addsuffix .build,$(DIRS))
-BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) lib/c)
-
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
-
-.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
+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
 
 all: $(BUILDS) $(BUILDS_TESTS)
 
-$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BUILDS_TESTS): $(BASE_BUILDS) $(BUILDS)
         $(MAKE) -r -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
@@ -264 +265 @@
         -$(MAKE) -r -C $(basename $@) clean
 
-$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BASE_BUILDS) $(BUILDS):
         $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
 
-$(LIBS_BUILD): $(LIBC_BUILD)
-        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
-
-$(LIBC_BUILD):
-        $(MAKE) -r -C $(basename $@) all PRECHECK=$(PRECHECK)
+$(DEPS): %/deps.mk: %/Makefile
+        $(MAKE) -r -C $(@D) deps.mk SELF_TARGET="$(@D).build"
+
+# Special case for base libraries.
+lib/c.build: lib/softfloat.build lib/softint.build
+
+$(BUILDS): $(BASE_BUILDS)
+
+-include $(DEPS)
+

uspace/Makefile.common

@@ -264 +264 @@
         touch tag
 
+# Generate inter-module make dependencies.
+# This is needed to ensure correct build order of libraries and code depending on them.
+deps.mk: Makefile
+        echo > $@.new
+        for lib in $(LIBS); do \
+                echo "$(SELF_TARGET): lib/$$lib.build" >> $@.new; \
+        done
+        mv -f $@.new $@
+
 %.disasm: %
 ifeq ($(CONFIG_LINE_DEBUG),y)