summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-11-21 00:34:20 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-11-21 00:34:20 +0100
commit4a016d139e2dadddfb684308d141de53ba1e5c8f (patch)
tree58e916990ff47a6f1dfa8294beaecc50b02d2ca2
parent38a22f56caa1925954b3f505a6b4326b41625a05 (diff)
simplify top-level Makefile some more
Change-Id: Ie1d53db34f812a83940196d0bf6e4ad8aaa8eab6
-rw-r--r--Makefile.in16
1 files changed, 3 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 9b6d0a93c09a..e6cba7d079a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,9 +9,7 @@
.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck
-ifeq ($(MAKECMDGOALS),)
-MAKECMDGOALS:=all
-endif
+MAKECMDGOALS?=all
SHELL=/usr/bin/env bash
SRCDIR := @SRC_ROOT@
@@ -47,19 +45,11 @@ else # MAKE_RESTARTS
all: build
-ifeq ($(gb_Side),)
-gb_Side := host
-endif
+gb_Side ?= host
include $(BUILDDIR)/config_$(gb_Side).mk
-ifeq ($(GMAKE_OPTIONS),)
-ifeq ($(verbose)$(VERBOSE),)
-export GMAKE_OPTIONS:=-rs$(MAKEFLAGS)
-else
-export GMAKE_OPTIONS:=-r$(MAKEFLAGS)
-endif
-endif
+export GMAKE_OPTIONS?=-r$(if $(verbose)$(VERBOSE),,s)$(MAKEFLAGS)
#
# Partial Build