diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-24 23:01:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-24 23:01:36 -0400 |
commit | 1e467e68e51b116e026247d0defc806b462c095e (patch) | |
tree | 87203f5dbb1cb24402aa966153ce49d176cc47db /tools/Makefile | |
parent | 14738e03312ff1137109d68bcbf103c738af0f4a (diff) | |
parent | 36f95a0b34cb980dcfff9c1082ca5d8f0dc5e78b (diff) |
Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
Pull documentation updates from Jonathan Corbet:
"The main thing here is Ingo's big subdirectory documenting feature
support for each architecture. Beyond that, it's the usual pile of
fixes, tweaks, and small additions"
* tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (79 commits)
doc:md: fix typo in md.txt.
Documentation/mic/mpssd: don't build x86 userspace when cross compiling
Documentation/prctl: don't build tsc tests when cross compiling
Documentation/vDSO: don't build tests when cross compiling
Doc:ABI/testing: Fix typo in sysfs-bus-fcoe
Doc: Docbook: Change wikipedia's URL from http to https in scsi.tmpl
Doc: Change wikipedia's URL from http to https
Documentation/kernel-parameters: add missing pciserial to the earlyprintk
Doc:pps: Fix typo in pps.txt
kbuild : Fix documentation of INSTALL_HDR_PATH
Documentation: filesystems: updated struct file_operations documentation in vfs.txt
kbuild: edit explanation of clean-files variable
Doc: ja_JP: Fix typo in HOWTO
Move freefall program from Documentation/ to tools/
Documentation: ARM: EXYNOS: Describe boot loaders interface
Doc:nfc: Fix typo in nfc-hci.txt
vfs: Minor documentation fix
Doc: networking: txtimestamp: fix printf format warning
Documentation, intel_pstate: Improve legacy mode internal governors description
Documentation: extend use case for EXPORT_SYMBOL_GPL()
...
Diffstat (limited to 'tools/Makefile')
-rw-r--r-- | tools/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index b35102721cbb..b113078fb7ad 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -23,6 +23,7 @@ help: | |||
23 | @echo ' vm - misc vm tools' | 23 | @echo ' vm - misc vm tools' |
24 | @echo ' x86_energy_perf_policy - Intel energy policy tool' | 24 | @echo ' x86_energy_perf_policy - Intel energy policy tool' |
25 | @echo ' tmon - thermal monitoring and tuning tool' | 25 | @echo ' tmon - thermal monitoring and tuning tool' |
26 | @echo ' freefall - laptop accelerometer program for disk protection' | ||
26 | @echo '' | 27 | @echo '' |
27 | @echo 'You can do:' | 28 | @echo 'You can do:' |
28 | @echo ' $$ make -C tools/ <tool>_install' | 29 | @echo ' $$ make -C tools/ <tool>_install' |
@@ -72,6 +73,9 @@ turbostat x86_energy_perf_policy: FORCE | |||
72 | tmon: FORCE | 73 | tmon: FORCE |
73 | $(call descend,thermal/$@) | 74 | $(call descend,thermal/$@) |
74 | 75 | ||
76 | freefall: FORCE | ||
77 | $(call descend,laptop/$@) | ||
78 | |||
75 | acpi_install: | 79 | acpi_install: |
76 | $(call descend,power/$(@:_install=),install) | 80 | $(call descend,power/$(@:_install=),install) |
77 | 81 | ||
@@ -90,10 +94,13 @@ turbostat_install x86_energy_perf_policy_install: | |||
90 | tmon_install: | 94 | tmon_install: |
91 | $(call descend,thermal/$(@:_install=),install) | 95 | $(call descend,thermal/$(@:_install=),install) |
92 | 96 | ||
97 | freefall_install: | ||
98 | $(call descend,laptop/$(@:_install=),install) | ||
99 | |||
93 | install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \ | 100 | install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \ |
94 | perf_install selftests_install turbostat_install usb_install \ | 101 | perf_install selftests_install turbostat_install usb_install \ |
95 | virtio_install vm_install net_install x86_energy_perf_policy_install \ | 102 | virtio_install vm_install net_install x86_energy_perf_policy_install \ |
96 | tmon | 103 | tmon freefall_install |
97 | 104 | ||
98 | acpi_clean: | 105 | acpi_clean: |
99 | $(call descend,power/acpi,clean) | 106 | $(call descend,power/acpi,clean) |
@@ -122,8 +129,11 @@ turbostat_clean x86_energy_perf_policy_clean: | |||
122 | tmon_clean: | 129 | tmon_clean: |
123 | $(call descend,thermal/tmon,clean) | 130 | $(call descend,thermal/tmon,clean) |
124 | 131 | ||
132 | freefall_clean: | ||
133 | $(call descend,laptop/freefall,clean) | ||
134 | |||
125 | clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \ | 135 | clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \ |
126 | perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \ | 136 | perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \ |
127 | vm_clean net_clean x86_energy_perf_policy_clean tmon_clean | 137 | vm_clean net_clean x86_energy_perf_policy_clean tmon_clean freefall_clean |
128 | 138 | ||
129 | .PHONY: FORCE | 139 | .PHONY: FORCE |