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 6bf03c3..6c4dd7c 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -5,20 +5,28 @@ libpsensor_a_SOURCES = \
        bool.h\
        color.h color.c\
        hdd.h hdd_hddtemp.c\
-       lmsensor.h lmsensor.c\
-       measure.h measure.c \
+       lmsensor.h\
+       measure.h measure.c\
        nvidia.h\
+       parray.h\
+       pgtop2.h\
        plog.h plog.c\
        pmutex.h pmutex.c\
        psensor.h psensor.c\
        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
 
+if SENSORS
+libpsensor_a_SOURCES += lmsensor.c
+LIBS += $(SENSORS_LIBS)
+endif
+
 if ATASMART
 libpsensor_a_SOURCES += hdd_atasmart.c
 LIBS += $(ATASMART_LIBS)
@@ -36,7 +44,7 @@ libpsensor_a_SOURCES += amd.c
 endif
 
 if GTOP
-libpsensor_a_SOURCES += pgtop2.c pgtop2.h
+libpsensor_a_SOURCES += pgtop2.c
 LIBS += $(GTOP_LIBS)
 AM_CPPFLAGS += $(GTOP_CFLAGS)
 endif
@@ -48,13 +56,15 @@ AM_CPPFLAGS += $(JSON_CFLAGS)
 endif
 
 if LIBUDISKS2
-libpsensor_a_SOURCES += pudisks2.c pudisks2.h
+libpsensor_a_SOURCES += pudisks2.c
 LIBS += $(LIBUDISKS2_LIBS)
 AM_CPPFLAGS += $(LIBUDISKS2_CFLAGS)
 endif
 
 EXTRA_DIST=$(libpsensor_a_SOURCES) \
        amd.c \
-       pgtop2.c pgtop2.h \
+       pgtop2.c \
+       lmsensor.c \
        nvidia.c \
-       pudisks2.c pudisks2.h
+       psensor_json.h psensor_json.c \
+       pudisks2.c