From: Joe Konno <joe.konno at linux.intel.com>
To: powertop@lists.01.org
Subject: Re: [Powertop] [PATCH v3 04/15] clean up Makefile.am files
Date: Tue, 14 Oct 2014 16:34:44 -0700 [thread overview]
Message-ID: <543DB314.2060504@linux.intel.com> (raw)
In-Reply-To: 1410125238-29600-5-git-send-email-kerolasa@iki.fi
[-- Attachment #1: Type: text/plain, Size: 8356 bytes --]
Trivial nit, otherwise LGTM.
Reviewed-By: Joe Konno <joe.konno(a)intel.com>
On 09/07/2014 02:27 PM, Sami Kerola wrote:
> Use vertical rather than horizontal lists, and get rid of deprecated
> ACLOCAL_AMFLAGS instruction. The src/Makefile.am source file list also
> needed sorting, as the items order seemed more or less random.
>
> Signed-off-by: Sami Kerola <kerolasa(a)iki.fi>
> ---
> Makefile.am | 14 +++-
> src/Makefile.am | 193 +++++++++++++++++++++++++++++++++++++++++++-------------
> 2 files changed, 161 insertions(+), 46 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index f5e466b..c8d0ae2 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,6 +1,14 @@
> AUTOMAKE_OPTIONS = subdir-objects
> -ACLOCAL_AMFLAGS = -I m4
>
> -SUBDIRS = traceevent src po doc
> +SUBDIRS = \
> + traceevent \
> + src \
> + po \
> + doc
>
> -EXTRA_DIST = README TODO Android.mk COPYING autogen.sh
> +EXTRA_DIST = \
> + README \
> + TODO \
> + Android.mk \
> + COPYING \
> + autogen.sh
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 6886388..311b75e 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1,54 +1,161 @@
> AUTOMAKE_OPTIONS = subdir-objects
> -ACLOCAL_AMFLAGS = -I ../m4
>
> sbin_PROGRAMS = powertop
> nodist_powertop_SOURCES = css.h
>
> -powertop_SOURCES = parameters/persistent.cpp parameters/learn.cpp parameters/parameters.cpp \
> - parameters/parameters.h display.cpp cpu/cpu_core.cpp cpu/cpudevice.cpp \
> - cpu/cpu.cpp cpu/cpu.h cpu/cpu_linux.cpp cpu/abstract_cpu.cpp cpu/intel_cpus.h \
> - cpu/cpu_package.cpp cpu/cpudevice.h cpu/intel_cpus.cpp devlist.h devlist.cpp \
> - lib.cpp report/report.cpp process/process.cpp process/interrupt.h process/timer.h \
> - process/processdevice.cpp process/powerconsumer.cpp process/work.h \
> - process/timer.cpp process/process.h process/work.cpp process/do_process.cpp \
> - process/processdevice.h process/interrupt.cpp process/powerconsumer.h report/report.h \
> - perf/perf.cpp perf/perf_event.h perf/perf.h perf/perf_bundle.h perf/perf_bundle.cpp \
> - display.h devices/rfkill.h devices/i915-gpu.cpp devices/device.cpp devices/alsa.cpp \
> - devices/runtime_pm.cpp devices/thinkpad-fan.cpp devices/usb.cpp devices/ahci.cpp \
> - devices/thinkpad-light.cpp devices/ahci.h devices/i915-gpu.h devices/network.h \
> - devices/rfkill.cpp devices/alsa.h devices/thinkpad-fan.h devices/device.h \
> - devices/usb.h devices/backlight.h devices/backlight.cpp devices/runtime_pm.h \
> - devices/thinkpad-light.h devices/network.cpp lib.h \
> - tuning/bluetooth.cpp tuning/tuning.cpp tuning/tuningusb.cpp \
> - tuning/ethernet.cpp tuning/bluetooth.h tuning/tuning.h tuning/ethernet.h \
> - tuning/tunable.cpp tuning/nl80211.h tuning/iw.c tuning/wifi.cpp tuning/tuningsysfs.h \
> - tuning/tuningsysfs.cpp tuning/wifi.h tuning/runtime.cpp tuning/tunable.h \
> - tuning/runtime.h tuning/tuningusb.h tuning/iw.h calibrate/calibrate.cpp \
> - calibrate/calibrate.h measurement/measurement.cpp \
> - measurement/measurement.h measurement/acpi.cpp measurement/sysfs.h measurement/sysfs.cpp \
> - measurement/acpi.h measurement/extech.cpp measurement/extech.h \
> - report/report-maker.cpp report/report-maker.h report/report-formatter.h \
> - report/report-formatter-base.cpp report/report-formatter-base.h \
> - report/report-formatter-csv.cpp report/report-formatter-csv.h \
> - report/report-formatter-html.cpp report/report-formatter-html.h \
> - report/report-data-html.cpp report/report-data-html.h \
> - main.cpp css.h powertop.css cpu/intel_gpu.cpp \
> - cpu/rapl/rapl_interface.cpp cpu/cpu_rapl_device.cpp cpu/rapl/rapl_interface.h\
> - cpu/dram_rapl_device.cpp devices/gpu_rapl_device.cpp cpu/cpu_rapl_device.h \
> - cpu/dram_rapl_device.h devices/gpu_rapl_device.h
> -
> -
> -powertop_CXXFLAGS = -fno-omit-frame-pointer -fstack-protector -Wall -Wshadow -Wformat $(NCURSES_CFLAGS) $(PCIUTILS_CFLAGS) $(LIBNL_CFLAGS) $(GLIB2_CFLAGS)
> -
> -
> -powertop_CPPFLAGS = -D_FORTIFY_SOURCE=2 $(NCURSES_CFLAGS) $(PCIUTILS_CFLAGS) $(LIBNL_CFLAGS) $(GLIB2_CFLAGS) $(LIBZ_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
> -
> -powertop_LDADD = ../traceevent/libtraceevnet.la
> -
> -AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) $(PTHREAD_LIBS) $(RESOLV_LIBS)
> +powertop_SOURCES = \
> + css.h \
> + devlist.cpp \
> + devlist.h \
> + display.cpp \
> + display.h \
> + lib.cpp \
> + lib.h \
> + main.cpp \
> + powertop.css \
> + \
Why the white line here?
> + calibrate/calibrate.cpp \
> + calibrate/calibrate.h \
> + cpu/abstract_cpu.cpp \
> + cpu/cpu.cpp \
> + cpu/cpu.h \
> + cpu/cpu_core.cpp \
> + cpu/cpu_linux.cpp \
> + cpu/cpu_package.cpp \
> + cpu/cpu_rapl_device.cpp \
> + cpu/cpu_rapl_device.h \
> + cpu/cpudevice.cpp \
> + cpu/cpudevice.h \
> + cpu/dram_rapl_device.cpp \
> + cpu/dram_rapl_device.h \
> + cpu/intel_cpus.cpp \
> + cpu/intel_cpus.h \
> + cpu/intel_gpu.cpp \
> + cpu/rapl/rapl_interface.cpp \
> + cpu/rapl/rapl_interface.h \
> + devices/ahci.cpp \
> + devices/ahci.h \
> + devices/alsa.cpp \
> + devices/alsa.h \
> + devices/backlight.cpp \
> + devices/backlight.h \
> + devices/device.cpp \
> + devices/device.h \
> + devices/gpu_rapl_device.cpp \
> + devices/gpu_rapl_device.h \
> + devices/i915-gpu.cpp \
> + devices/i915-gpu.h \
> + devices/network.cpp \
> + devices/network.h \
> + devices/rfkill.cpp \
> + devices/rfkill.h \
> + devices/runtime_pm.cpp \
> + devices/runtime_pm.h \
> + devices/thinkpad-fan.cpp \
> + devices/thinkpad-fan.h \
> + devices/thinkpad-light.cpp \
> + devices/thinkpad-light.h \
> + devices/usb.cpp \
> + devices/usb.h \
> + measurement/acpi.cpp \
> + measurement/acpi.h \
> + measurement/extech.cpp \
> + measurement/extech.h \
> + measurement/measurement.cpp \
> + measurement/measurement.h \
> + measurement/sysfs.cpp \
> + measurement/sysfs.h \
> + parameters/learn.cpp \
> + parameters/parameters.cpp \
> + parameters/parameters.h \
> + parameters/persistent.cpp \
> + perf/perf.cpp \
> + perf/perf.h \
> + perf/perf_bundle.cpp \
> + perf/perf_bundle.h \
> + perf/perf_event.h \
> + process/do_process.cpp \
> + process/interrupt.cpp \
> + process/interrupt.h \
> + process/powerconsumer.cpp \
> + process/powerconsumer.h \
> + process/process.cpp \
> + process/process.h \
> + process/processdevice.cpp \
> + process/processdevice.h \
> + process/timer.cpp \
> + process/timer.h \
> + process/work.cpp \
> + process/work.h \
> + report/report-data-html.cpp \
> + report/report-data-html.h \
> + report/report-formatter-base.cpp \
> + report/report-formatter-base.h \
> + report/report-formatter-csv.cpp \
> + report/report-formatter-csv.h \
> + report/report-formatter-html.cpp \
> + report/report-formatter-html.h \
> + report/report-formatter.h \
> + report/report-maker.cpp \
> + report/report-maker.h \
> + report/report.cpp \
> + report/report.h \
> + tuning/bluetooth.cpp \
> + tuning/bluetooth.h \
> + tuning/ethernet.cpp \
> + tuning/ethernet.h \
> + tuning/iw.c \
> + tuning/iw.h \
> + tuning/nl80211.h \
> + tuning/runtime.cpp \
> + tuning/runtime.h \
> + tuning/tunable.cpp \
> + tuning/tunable.h \
> + tuning/tuning.cpp \
> + tuning/tuning.h \
> + tuning/tuningsysfs.cpp \
> + tuning/tuningsysfs.h \
> + tuning/tuningusb.cpp \
> + tuning/tuningusb.h \
> + tuning/wifi.cpp \
> + tuning/wifi.h
> +
> +powertop_CXXFLAGS = \
> + -Wall \
> + -Wformat \
> + -Wshadow \
> + -fno-omit-frame-pointer \
> + -fstack-protector \
> + $(GLIB2_CFLAGS) \
> + $(LIBNL_CFLAGS) \
> + $(NCURSES_CFLAGS) \
> + $(PCIUTILS_CFLAGS)
> +
> +
> +powertop_CPPFLAGS = \
> + -DLOCALEDIR=\"$(localedir)\" \
> + -D_FORTIFY_SOURCE=2 \
> + $(GLIB2_CFLAGS) \
> + $(LIBNL_CFLAGS) \
> + $(LIBZ_CFLAGS) \
> + $(NCURSES_CFLAGS) \
> + $(PCIUTILS_CFLAGS)
> +
> +powertop_LDADD = \
> + ../traceevent/libtraceevnet.la
> +
> +AM_LDFLAGS = \
> + $(LIBNL_LIBS) \
> + $(LIBS) \
> + $(LIBZ_LIBS) \
> + $(NCURSES_LIBS) \
> + $(PCIUTILS_LIBS) \
> + $(PTHREAD_LIBS) \
> + $(RESOLV_LIBS)
>
> BUILT_SOURCES = css.h
> CLEANFILES = css.h
> +
> css.h: powertop.css
> $(SHELL) ${srcdir}/csstoh.sh ${srcdir}/powertop.css css.h
>
>
next reply other threads:[~2014-10-14 23:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-14 23:34 Joe Konno [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-15 13:03 [Powertop] [PATCH v3 04/15] clean up Makefile.am files Sergey Senozhatsky
2014-10-15 8:25 Sami Kerola
2014-09-07 21:27 Sami Kerola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=543DB314.2060504@linux.intel.com \
--to=powertop@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.