diff options
| author | Lukas Larsson <[email protected]> | 2017-07-13 10:43:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-07-17 10:01:53 +0200 |
| commit | ee297c32a768ec333e2a8a3ef829a7690e91d306 (patch) | |
| tree | 257666d049ad8094746396b0f050aa4c89675798 /erts/Makefile | |
| parent | 241f27c4942d6b765abcec9d5a9712e07861bc13 (diff) | |
| download | otp-ee297c32a768ec333e2a8a3ef829a7690e91d306.tar.gz otp-ee297c32a768ec333e2a8a3ef829a7690e91d306.tar.bz2 otp-ee297c32a768ec333e2a8a3ef829a7690e91d306.zip | |
erts: Cleanup configure and makefiles after non-smp removal
Diffstat (limited to 'erts/Makefile')
| -rw-r--r-- | erts/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/erts/Makefile b/erts/Makefile index 12d2ec57a8..73d8560c1e 100644 --- a/erts/Makefile +++ b/erts/Makefile @@ -34,7 +34,7 @@ ERTSDIRS += start_scripts endif .PHONY: all -all: $(FLAVORS) +all: smp .PHONY: docs docs: @@ -44,7 +44,7 @@ docs: debug opt lcnt clean: $(V_at)for d in emulator $(ERTSDIRS); do \ if test -d $$d; then \ - ( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \ + ( cd $$d && $(MAKE) $@ ) || exit $$?; \ fi ; \ done (cd preloaded/src && $(MAKE) ../ebin/erts.app) @@ -54,10 +54,10 @@ debug opt lcnt clean: # - don't use them in scripts or assume they will always stay like this! # -.PHONY: $(FLAVORS) -$(FLAVORS): +.PHONY: smp +smp: $(V_at)for type in $(TYPES); do \ - ( $(MAKE) $$type FLAVOR=$@ ); \ + ( $(MAKE) $$type ) || exit $$?; \ done # Make erl script and erlc in $(ERL_TOP)/bin which runs the compiled version @@ -129,10 +129,8 @@ makefiles: .PHONY: release release: - $(V_at)for f in $(FLAVORS); do \ - for t in $(TYPES); do \ - ( cd emulator && $(MAKE) release FLAVOR=$$f TYPE=$$t ) \ - done \ + for t in $(TYPES); do \ + ( cd emulator && $(MAKE) release TYPE=$$t ) || exit $$?; \ done $(V_at)for d in $(ERTSDIRS) $(XINSTDIRS); do \ if test -d $$d; then \ |