Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96a0d99c authored by Brian Norris's avatar Brian Norris Committed by Zhang Rui
Browse files

tools/thermal: tmon: use pkg-config to determine library dependencies 



Some distros (e.g., Arch Linux) don't package the tinfo library
separately from ncurses, so don't unconditionally include it. Instead,
use pkg-config.

The $(STATIC) ugliness is to handle the reported build case from commit
6b533269 ("tools/thermal: tmon: fix compilation errors when building
statically"), where a developer wants to be able to build with:

  make LDFLAGS=-static

which requires an additional pkg-config flag.

Finally, support a lowest common denominator fallback (-lpanel
-lncurses) for build systems that don't have pkg-config entries for
ncurses.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Acked-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 1b0eaa2c

tools/thermal/tmon/Makefile

+10 −1
Original line number Original line Diff line number Diff line
@@ -16,12 +16,21 @@ INSTALL_CONFIGFILE=install -m 644 -p 
CONFIG_FILE=

CONFIG_FILE=

CONFIG_PATH=

CONFIG_PATH=





# Static builds might require -ltinfo, for instance

ifneq ($(findstring -static, $(LDFLAGS)),)

STATIC := --static

endif



TMON_LIBS=-lm -lpthread

TMON_LIBS += $(shell pkg-config --libs $(STATIC) panelw ncursesw 2> /dev/null || \

		     pkg-config --libs $(STATIC) panel ncurses 2> /dev/null || \

		     echo -lpanel -lncurses)





OBJS = tmon.o tui.o sysfs.o pid.o

OBJS = tmon.o tui.o sysfs.o pid.o

OBJS +=

OBJS +=





tmon: $(OBJS) Makefile tmon.h

tmon: $(OBJS) Makefile tmon.h

	$(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread

	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS)  -o $(TARGET) $(TMON_LIBS)





valgrind: tmon

valgrind: tmon

	 sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null

	 sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null