Changeset 1783f75 in mainline for Makefile


Ignore:
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:
e503cea9
Parents:
b3ff685
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-29 14:08:34)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Remove autotool.py

Meson does everything that it was used for.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rb3ff685 r1783f75  
    3535CHECK = tools/check.sh
    3636CONFIG = tools/config.py
    37 AUTOTOOL = tools/autotool.py
    38 SANDBOX = autotool
    3937MESON = meson
    4038
     
    4240
    4341CONFIG_RULES = HelenOS.config
    44 
    45 COMMON_MAKEFILE = Makefile.common
    4642
    4743CONFIG_MAKEFILE = Makefile.config
     
    6157endif
    6258
    63 CROSS_PATH = $(shell dirname "$(CC)")
     59CROSS_PREFIX ?= /usr/local/cross
     60CROSS_PATH = $(CROSS_PREFIX)/bin
    6461
    6562CROSS_TARGET ?= $(UARCH)
     
    6966endif
    7067
    71 .PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release meson export-posix space
     68.PHONY: all precheck cscope cscope_parts config_default config distclean clean check releasefile release meson export-posix space
    7269
    73 all: meson export-cross test-xcw
     70all: meson
    7471
    7572$(BUILD_DIR)/build.ninja: Makefile.config version
     
    7976        PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
    8077
    81 test-xcw: meson export-cross
     78test-xcw: meson
    8279ifeq ($(CONFIG_DEVEL_FILES),y)
    8380        export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
    8481endif
    85 
    86 export-posix: meson
    87 ifndef EXPORT_DIR
    88         @echo ERROR: Variable EXPORT_DIR is not defined. && false
    89 else
    90         mkdir -p $(EXPORT_DIR)
    91         $(MAKE) -r -C uspace/lib/posix export EXPORT_DIR=$(abspath $(EXPORT_DIR)) UARCH=$(UARCH)
    92 endif
    93 
    94 export-cross: meson
    95         mkdir -p uspace/export
    96         $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export) UARCH=$(UARCH)
    9782
    9883precheck: clean
     
    143128        git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
    144129
    145 # Autotool (detects compiler features)
    146 
    147 autotool $(COMMON_MAKEFILE): $(CONFIG_MAKEFILE) $(AUTOTOOL)
    148         $(AUTOTOOL)
    149 
    150130# Build-time configuration
    151131
     
    177157
    178158clean:
    179         rm -fr $(SANDBOX)
    180         $(MAKE) -r -C kernel clean
    181         $(MAKE) -r -C uspace clean
    182         $(MAKE) -r -C boot clean
    183159        $(MAKE) -r -C doxygen clean
    184160        $(MAKE) -r -C tools/xcw/demo clean
Note: See TracChangeset for help on using the changeset viewer.