[PATCH] Move freefall program from Documentation/ to tools/

[PATCH] Move freefall program from Documentation/ to tools/

[Pali Rohár]

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
 Documentation/laptops/.gitignore                   |    1 -
 Documentation/laptops/00-INDEX                     |    2 --
 Documentation/laptops/Makefile                     |    2 +-
 tools/Makefile                                     |   14 ++++++++++++--
 tools/laptop/freefall/Makefile                     |   17 +++++++++++++++++
 .../laptops => tools/laptop/freefall}/freefall.c   |    0
 6 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 tools/laptop/freefall/Makefile
 rename {Documentation/laptops => tools/laptop/freefall}/freefall.c (100%)

diff --git a/Documentation/laptops/.gitignore b/Documentation/laptops/.gitignore
index da2bd06..9fc984e 100644
--- a/Documentation/laptops/.gitignore
+++ b/Documentation/laptops/.gitignore
@@ -1,2 +1 @@
 dslm
-freefall
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index a3b4f20..7c0ac2a 100644
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -8,8 +8,6 @@ disk-shock-protection.txt
 	- information on hard disk shock protection.
 dslm.c
 	- Simple Disk Sleep Monitor program
-freefall.c
-	- (HP/DELL) laptop accelerometer program for disk protection.
 laptop-mode.txt
 	- how to conserve battery power using laptop-mode.
 sony-laptop.txt
diff --git a/Documentation/laptops/Makefile b/Documentation/laptops/Makefile
index 2b0fa5e..0abe44f 100644
--- a/Documentation/laptops/Makefile
+++ b/Documentation/laptops/Makefile
@@ -1,5 +1,5 @@
 # List of programs to build
-hostprogs-y := dslm freefall
+hostprogs-y := dslm
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
diff --git a/tools/Makefile b/tools/Makefile
index 9a617ad..4557c39 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -18,6 +18,7 @@ help:
 	@echo '  vm         - misc vm tools'
 	@echo '  x86_energy_perf_policy - Intel energy policy tool'
 	@echo '  tmon       - thermal monitoring and tuning tool'
+	@echo '  freefall   - laptop accelerometer program for disk protection'
 	@echo ''
 	@echo 'You can do:'
 	@echo ' $$ make -C tools/ <tool>_install'
@@ -62,6 +63,9 @@ turbostat x86_energy_perf_policy: FORCE
 tmon: FORCE
 	$(call descend,thermal/$@)
 
+freefall: FORCE
+	$(call descend,laptop/$@)
+
 acpi_install:
 	$(call descend,power/$(@:_install=),install)
 
@@ -80,10 +84,13 @@ turbostat_install x86_energy_perf_policy_install:
 tmon_install:
 	$(call descend,thermal/$(@:_install=),install)
 
+freefall_install:
+	$(call descend,laptop/$(@:_install=),install)
+
 install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \
 		perf_install selftests_install turbostat_install usb_install \
 		virtio_install vm_install net_install x86_energy_perf_policy_install \
-	tmon
+		tmon freefall_install
 
 acpi_clean:
 	$(call descend,power/acpi,clean)
@@ -112,8 +119,11 @@ turbostat_clean x86_energy_perf_policy_clean:
 tmon_clean:
 	$(call descend,thermal/tmon,clean)
 
+freefall_clean:
+	$(call descend,laptop/freefall,clean)
+
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
 		perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
-		vm_clean net_clean x86_energy_perf_policy_clean tmon_clean
+		vm_clean net_clean x86_energy_perf_policy_clean tmon_clean freefall_clean
 
 .PHONY: FORCE
diff --git a/tools/laptop/freefall/Makefile b/tools/laptop/freefall/Makefile
new file mode 100644
index 0000000..48c6c93
--- /dev/null
+++ b/tools/laptop/freefall/Makefile
@@ -0,0 +1,17 @@
+PREFIX ?= /usr
+SBINDIR ?= sbin
+INSTALL ?= install
+CC = $(CROSS_COMPILE)gcc
+
+TARGET = freefall
+
+all: $(TARGET)
+
+%: %.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+clean:
+	$(RM) $(TARGET)
+
+install: freefall
+	$(INSTALL) -D -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/$(SBINDIR)/$(TARGET)
diff --git a/Documentation/laptops/freefall.c b/tools/laptop/freefall/freefall.c
similarity index 100%
rename from Documentation/laptops/freefall.c
rename to tools/laptop/freefall/freefall.c
-- 
1.7.9.5

Re: [PATCH] Move freefall program from Documentation/ to tools/

[Pavel Machek]

On Sat 2015-06-06 15:42:28, Pali Rohár wrote:
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

And thanks!
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] Move freefall program from Documentation/ to tools/

[Jonathan Corbet]

On Sat,  6 Jun 2015 15:42:28 +0200
Pali Rohár <pali.rohar@gmail.com> wrote:

>  Documentation/laptops/.gitignore                   |    1 -
>  Documentation/laptops/00-INDEX                     |    2 --
>  Documentation/laptops/Makefile                     |    2 +-
>  tools/Makefile                                     |   14 ++++++++++++--
>  tools/laptop/freefall/Makefile                     |   17 +++++++++++++++++
>  .../laptops => tools/laptop/freefall}/freefall.c   |    0
>  6 files changed, 30 insertions(+), 6 deletions(-)
>  create mode 100644 tools/laptop/freefall/Makefile
>  rename {Documentation/laptops => tools/laptop/freefall}/freefall.c (100%)

Applied to the docs tree, thanks.

jon