diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /scripts/basic/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'scripts/basic/Makefile')
| -rw-r--r-- | scripts/basic/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index 09559951df12..4fcef87bb875 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile | |||
| @@ -7,9 +7,8 @@ | |||
| 7 | # .config is included by main Makefile. | 7 | # .config is included by main Makefile. |
| 8 | # --------------------------------------------------------------------------- | 8 | # --------------------------------------------------------------------------- |
| 9 | # fixdep: Used to generate dependency information during build process | 9 | # fixdep: Used to generate dependency information during build process |
| 10 | # docproc: Used in Documentation/DocBook | ||
| 11 | 10 | ||
| 12 | hostprogs-y := fixdep docproc hash | 11 | hostprogs-y := fixdep |
| 13 | always := $(hostprogs-y) | 12 | always := $(hostprogs-y) |
| 14 | 13 | ||
| 15 | # fixdep is needed to compile other host programs | 14 | # fixdep is needed to compile other host programs |