summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-11-05 15:47:39 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-11-05 15:47:39 +0100
commite3c49aac6963901f793f8b5cb48d041d36162bcf (patch)
tree55fbb5b8f1b62b7e3c3cbbe87b122945e7b9ae90 /Makefile
parenta407a4ddaac41819948d16f5bbaa657974e75654 (diff)
parentf95ce0fff0775c04954ae2e4542308baaa434ac8 (diff)
downloadbarebox-e3c49aac6963901f793f8b5cb48d041d36162bcf.tar.gz
barebox-e3c49aac6963901f793f8b5cb48d041d36162bcf.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 60cb02cfd0..6fb4967cae 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ NAME = None
# Do not:
# o use make's built-in rules and variables
-# (this increases performance and avoid hard-to-debug behavour);
+# (this increases performance and avoids hard-to-debug behaviour);
# o print "Entering directory ...";
MAKEFLAGS += -rR --no-print-directory
@@ -1137,7 +1137,7 @@ endif #ifeq ($(mixed-targets),1)
# Single targets
# ---------------------------------------------------------------------------
# Single targets are compatible with:
-# - build whith mixed source and output
+# - build with mixed source and output
# - build with separate output dir 'make O=...'
# - external modules
#
@@ -1211,6 +1211,5 @@ FORCE:
Makefile: ;
# Declare the contents of the .PHONY variable as phony. We keep that
-# information in a variable se we can use it in if_changed and friends.
+# information in a variable so we can use it in if_changed and friends.
.PHONY: $(PHONY)
-