summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2015-07-28 13:25:32 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-31 23:39:31 +0200
commit4305cd02436dbe0b61b1930f93053a699af40e6a (patch)
tree9730cdadb99e3abccb6f81a5ceddca298d0b6a61 /tools/power
parent391fc234b543991dd7d0361e634cdf5abfbdd0a3 (diff)
downloadlinux-4305cd02436dbe0b61b1930f93053a699af40e6a.tar.gz
linux-4305cd02436dbe0b61b1930f93053a699af40e6a.tar.bz2
linux-4305cd02436dbe0b61b1930f93053a699af40e6a.zip
tools/power/acpi: Enable build for EC userspace tool
This patch allows EC userspace tool to be built as an ACPI tool. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'tools/power')
-rw-r--r--tools/power/acpi/Makefile16
-rw-r--r--tools/power/acpi/tools/ec/Makefile33
2 files changed, 22 insertions, 27 deletions
diff --git a/tools/power/acpi/Makefile b/tools/power/acpi/Makefile
index 3d052377b440..e882c8320135 100644
--- a/tools/power/acpi/Makefile
+++ b/tools/power/acpi/Makefile
@@ -10,18 +10,18 @@
include ../../scripts/Makefile.include
-all: acpidump
-clean: acpidump_clean
-install: acpidump_install
-uninstall: acpidump_uninstall
+all: acpidump ec
+clean: acpidump_clean ec_clean
+install: acpidump_install ec_install
+uninstall: acpidump_uninstall ec_uninstall
-acpidump: FORCE
+acpidump ec: FORCE
$(call descend,tools/$@,all)
-acpidump_clean:
+acpidump_clean ec_clean:
$(call descend,tools/$(@:_clean=),clean)
-acpidump_install:
+acpidump_install ec_install:
$(call descend,tools/$(@:_install=),install)
-acpidump_uninstall:
+acpidump_uninstall ec_uninstall:
$(call descend,tools/$(@:_uninstall=),uninstall)
.PHONY: FORCE
diff --git a/tools/power/acpi/tools/ec/Makefile b/tools/power/acpi/tools/ec/Makefile
index b7b0b929bd32..75d8a127b6ee 100644
--- a/tools/power/acpi/tools/ec/Makefile
+++ b/tools/power/acpi/tools/ec/Makefile
@@ -1,22 +1,17 @@
-ec_access: ec_access.o
- $(ECHO) " LD " $@
- $(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $< -o $@
- $(QUIET) $(STRIPCMD) $@
+# tools/power/acpi/tools/acpidump/Makefile - ACPI tool Makefile
+#
+# Copyright (c) 2015, Intel Corporation
+# Author: Lv Zheng <lv.zheng@intel.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License.
-%.o: %.c
- $(ECHO) " CC " $@
- $(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
+include ../../Makefile.config
-all: ec_access
+TOOL = ec
+TOOL_OBJS = \
+ ec_access.o
-install:
- $(INSTALL) -d $(DESTDIR)${sbindir}
- $(INSTALL_PROGRAM) ec_access $(DESTDIR)${sbindir}
-
-uninstall:
- - rm -f $(DESTDIR)${sbindir}/ec_access
-
-clean:
- -rm -f $(OUTPUT)ec_access
-
-.PHONY: all install uninstall
+include ../../Makefile.rules