summaryrefslogtreecommitdiff
path: root/docs/MakefileGuide.rst
diff options
context:
space:
mode:
authorDmitri Gribenko <gribozavr@gmail.com>2012-12-23 18:46:11 +0000
committerDmitri Gribenko <gribozavr@gmail.com>2012-12-23 18:46:11 +0000
commita048c237e6848f7c5e9e070a7b701031bb6601e1 (patch)
tree1807a41cf982b80a6150d53389da39fff706d244 /docs/MakefileGuide.rst
parent6f3d81a92919954d156c863d3aeb4ff09f701480 (diff)
downloadllvm-a048c237e6848f7c5e9e070a7b701031bb6601e1.tar.gz
llvm-a048c237e6848f7c5e9e070a7b701031bb6601e1.tar.bz2
llvm-a048c237e6848f7c5e9e070a7b701031bb6601e1.tar.xz
Documentation: fix typos reported in PR13866
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171006 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'docs/MakefileGuide.rst')
-rw-r--r--docs/MakefileGuide.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/MakefileGuide.rst b/docs/MakefileGuide.rst
index 168b0b3348..4988fe664d 100644
--- a/docs/MakefileGuide.rst
+++ b/docs/MakefileGuide.rst
@@ -60,7 +60,7 @@ To use the makefile system, you simply create a file named ``Makefile`` in your
directory and declare values for certain variables. The variables and values
that you select determine what the makefile system will do. These variables
enable rules and processing in the makefile system that automatically Do The
-Right Thing&trade;.
+Right Thing (C).
Including Makefiles
-------------------
@@ -241,7 +241,7 @@ and the names of the libraries you wish to link with the tool. For example:
says that we are to build a tool name ``mytool`` and that it requires three
libraries: ``mylib``, ``LLVMSupport.a`` and ``LLVMSystem.a``.
-Note that two different variables are use to indicate which libraries are
+Note that two different variables are used to indicate which libraries are
linked: ``USEDLIBS`` and ``LLVMLIBS``. This distinction is necessary to support
projects. ``LLVMLIBS`` refers to the LLVM libraries found in the LLVM object
directory. ``USEDLIBS`` refers to the libraries built by your project. In the
@@ -349,7 +349,7 @@ This target should be implemented by the ``Makefile`` in the project's ``test``
directory. It is invoked by the ``check`` target elsewhere. Each project is
free to define the actions of ``check-local`` as appropriate for that
project. The LLVM project itself uses dejagnu to run a suite of feature and
-regresson tests. Other projects may choose to use dejagnu or any other testing
+regression tests. Other projects may choose to use dejagnu or any other testing
mechanism.
``clean``
@@ -358,7 +358,7 @@ mechanism.
This target cleans the build directory, recursively removing all things that the
Makefile builds. The cleaning rules have been made guarded so they shouldn't go
awry (via ``rm -f $(UNSET_VARIABLE)/*`` which will attempt to erase the entire
-directory structure.
+directory structure).
``clean-local``
---------------
@@ -606,8 +606,8 @@ system that tell it what to do for the current directory.
the build process, such as code generators (e.g. ``tblgen``).
``OPTIONAL_DIRS``
- Specify a set of directories that may be built, if they exist, but its not
- an error for them not to exist.
+ Specify a set of directories that may be built, if they exist, but it is
+ not an error for them not to exist.
``PARALLEL_DIRS``
Specify a set of directories to build recursively and in parallel if the