projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use bool def from stdbool.h or define it if it does not exist
[psensor.git]
/
src
/
lib
/
Makefile.am
diff --git
a/src/lib/Makefile.am
b/src/lib/Makefile.am
index
48dc632
..
5a22d4d
100644
(file)
--- a/
src/lib/Makefile.am
+++ b/
src/lib/Makefile.am
@@
-1,32
+1,36
@@
noinst_LIBRARIES = libpsensor.a
noinst_LIBRARIES = libpsensor.a
-libpsensor_a_CFLAGS = -Wall -Werror
-
libpsensor_a_SOURCES = \
amd.h \
libpsensor_a_SOURCES = \
amd.h \
- cpu.h \
- measure.h measure.c \
+ bool.h \
color.h color.c \
color.h color.c \
+ cpu.h \
+ hdd.h hdd_hddtemp.c\
+ lmsensor.h lmsensor.c \
log.h log.c \
log.h log.c \
- psensor.h psensor.c\
- hdd.h hdd.c\
+ measure.h measure.c \
nvidia.h \
nvidia.h \
- lmsensor.h lmsensor.c \
- p_io.h p_io.c \
+ psensor.h psensor.c\
+ pio.h pio.c \
+ slog.c slog.h \
url.c url.h
url.c url.h
+AM_CPPFLAGS = -Wall -Werror
+
+if ATASMART
+libpsensor_a_SOURCES += hdd_atasmart.c
+LIBS += $(ATASMART_LIBS)
+AM_CPPFLAGS += $(ATASMART_CFLAGS)
+endif
+
if NVIDIA
libpsensor_a_SOURCES += nvidia.c
endif
if NVIDIA
libpsensor_a_SOURCES += nvidia.c
endif
-AM_CPPFLAGS=
-
if LIBATIADL
LIBS += $(LIBATIADL_LIBS)
AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
libpsensor_a_SOURCES += amd.c
if LIBATIADL
LIBS += $(LIBATIADL_LIBS)
AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
libpsensor_a_SOURCES += amd.c
-else
-libpsensor_a_CFLAGS += -pedantic
endif
if GTOP
endif
if GTOP
@@
-35,6
+39,12
@@
LIBS += $(GTOP_LIBS)
AM_CPPFLAGS += $(GTOP_CFLAGS)
endif
AM_CPPFLAGS += $(GTOP_CFLAGS)
endif
+if JSON
+libpsensor_a_SOURCES += psensor_json.h psensor_json.c
+LIBS += $(JSON_LIBS)
+AM_CPPFLAGS += $(JSON_CFLAGS)
+endif
+
EXTRA_DIST=$(libpsensor_a_SOURCES) \
amd.c \
cpu.c \
EXTRA_DIST=$(libpsensor_a_SOURCES) \
amd.c \
cpu.c \