projects
/
psensor-pkg-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/1.2.0'
[psensor-pkg-debian.git]
/
src
/
lib
/
Makefile.am
diff --git
a/src/lib/Makefile.am
b/src/lib/Makefile.am
index
df0c5eb
..
6c4dd7c
100644
(file)
--- a/
src/lib/Makefile.am
+++ b/
src/lib/Makefile.am
@@
-1,23
+1,32
@@
noinst_LIBRARIES = libpsensor.a
libpsensor_a_SOURCES = \
noinst_LIBRARIES = libpsensor.a
libpsensor_a_SOURCES = \
- amd.h \
- bool.h \
- color.h color.c \
- cpu.h \
+ amd.h\
+ bool.h\
+ color.h color.c\
hdd.h hdd_hddtemp.c\
hdd.h hdd_hddtemp.c\
- lmsensor.h lmsensor.c \
- plog.h plog.c \
- measure.h measure.c \
- ptime.h ptime.c \
- nvidia.h \
+ lmsensor.h\
+ measure.h measure.c\
+ nvidia.h\
+ parray.h\
+ pgtop2.h\
+ plog.h plog.c\
+ pmutex.h pmutex.c\
psensor.h psensor.c\
psensor.h psensor.c\
- pio.h pio.c \
- slog.c slog.h \
+ ptime.h ptime.c\
+ pio.h pio.c\
+ pudisks2.h\
+ slog.c slog.h\
+ temperature.c temperature.h\
url.c url.h
AM_CPPFLAGS = -Wall -Werror
url.c url.h
AM_CPPFLAGS = -Wall -Werror
+if SENSORS
+libpsensor_a_SOURCES += lmsensor.c
+LIBS += $(SENSORS_LIBS)
+endif
+
if ATASMART
libpsensor_a_SOURCES += hdd_atasmart.c
LIBS += $(ATASMART_LIBS)
if ATASMART
libpsensor_a_SOURCES += hdd_atasmart.c
LIBS += $(ATASMART_LIBS)
@@
-35,7
+44,7
@@
libpsensor_a_SOURCES += amd.c
endif
if GTOP
endif
if GTOP
-libpsensor_a_SOURCES +=
cpu
.c
+libpsensor_a_SOURCES +=
pgtop2
.c
LIBS += $(GTOP_LIBS)
AM_CPPFLAGS += $(GTOP_CFLAGS)
endif
LIBS += $(GTOP_LIBS)
AM_CPPFLAGS += $(GTOP_CFLAGS)
endif
@@
-46,7
+55,16
@@
LIBS += $(JSON_LIBS)
AM_CPPFLAGS += $(JSON_CFLAGS)
endif
AM_CPPFLAGS += $(JSON_CFLAGS)
endif
+if LIBUDISKS2
+libpsensor_a_SOURCES += pudisks2.c
+LIBS += $(LIBUDISKS2_LIBS)
+AM_CPPFLAGS += $(LIBUDISKS2_CFLAGS)
+endif
+
EXTRA_DIST=$(libpsensor_a_SOURCES) \
amd.c \
EXTRA_DIST=$(libpsensor_a_SOURCES) \
amd.c \
- cpu.c \
- nvidia.c
+ pgtop2.c \
+ lmsensor.c \
+ nvidia.c \
+ psensor_json.h psensor_json.c \
+ pudisks2.c