Changeset 2fff3c4 in mainline for Makefile

Timestamp:

2019-08-17T12:49:43Z (6 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:

c4e5d40

Parents:

ecf56f80

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-16 13:32:05)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Build kernel using meson

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -61 +61 @@
 CROSS_PATH = $(shell dirname "$(CC)")
 
-.PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace export-posix space
+.PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release common export-posix space
 
-all: kernel uspace export-cross test-xcw
+all: common export-cross test-xcw
         $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
 
@@ -70 +70 @@
 
 common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) build/build.ninja
-
-kernel: common
-        $(MAKE) -r -C kernel PRECHECK=$(PRECHECK)
-
-uspace: common
         PATH="$(CROSS_PATH):$$PATH" ninja -C build
         PATH="$(CROSS_PATH):$$PATH" DESTDIR="$$PWD/dist" meson install --no-rebuild --only-changed -C build > build/install.log
 
-test-xcw: uspace export-cross
+test-xcw: common export-cross
 ifeq ($(CONFIG_DEVEL_FILES),y)
         export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo