Merge tag 'upstream/1.1.2'

[psensor-pkg-ubuntu.git] / src / lib / Makefile.am

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c7052b4..6bf03c3 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,7 +4,6 @@ libpsensor_a_SOURCES = \
        amd.h\
        bool.h\
        color.h color.c\
-       cpu.h\
        hdd.h hdd_hddtemp.c\
        lmsensor.h lmsensor.c\
        measure.h measure.c \
@@ -37,7 +36,7 @@ libpsensor_a_SOURCES += amd.c
 endif
 
 if GTOP
-libpsensor_a_SOURCES += cpu.c
+libpsensor_a_SOURCES += pgtop2.c pgtop2.h
 LIBS += $(GTOP_LIBS)
 AM_CPPFLAGS += $(GTOP_CFLAGS)
 endif
@@ -48,7 +47,14 @@ LIBS += $(JSON_LIBS)
 AM_CPPFLAGS += $(JSON_CFLAGS)
 endif
 
+if LIBUDISKS2
+libpsensor_a_SOURCES += pudisks2.c pudisks2.h
+LIBS += $(LIBUDISKS2_LIBS)
+AM_CPPFLAGS += $(LIBUDISKS2_CFLAGS)
+endif
+
 EXTRA_DIST=$(libpsensor_a_SOURCES) \
        amd.c \
-       cpu.c \
-       nvidia.c
+       pgtop2.c pgtop2.h \
+       nvidia.c \
+       pudisks2.c pudisks2.h