Changeset 2b2783b in mainline

Timestamp:

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

1ef3213

Parents:

a8ccc7e

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 11:47:17)

git-committer:

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

Message:

Run just meson via make meson

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -69 +69 @@
 endif
 
-.PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release common export-posix space
+.PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release meson export-posix space
 
-all: common export-cross test-xcw
+all: meson export-cross test-xcw
         $(MAKE) -r -C boot PRECHECK=$(PRECHECK) BUILD_DIR=$(BUILD_DIR)
 
@@ -77 +77 @@
         PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
 
-common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
+meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
         PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
         PATH="$(CROSS_PATH):$$PATH" DESTDIR="$(BUILD_DIR)/dist" meson install --no-rebuild --only-changed -C $(BUILD_DIR) > $(BUILD_DIR)/install.log
 
-test-xcw: common export-cross
+test-xcw: meson export-cross
 ifeq ($(CONFIG_DEVEL_FILES),y)
         export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
 endif
 
-export-posix: common
+export-posix: meson
 ifndef EXPORT_DIR
         @echo ERROR: Variable EXPORT_DIR is not defined. && false
@@ -94 +94 @@
 endif
 
-export-cross: common
+export-cross: meson
         mkdir -p uspace/export
         $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export) UARCH=$(UARCH)