use glibtop instead of sysconf

[psensor.git] / src / server / Makefile.am

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 3b42c56..dc4ebc1 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,10 +1,9 @@
 bin_PROGRAMS =  psensor-server
 psensor_server_SOURCES = server.c server.h
 
-AM_CPPFLAGS = -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+AM_CPPFLAGS = -pedantic -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/libpsensor_json \
        $(SENSORS_CFLAGS)\
        $(JSON_CFLAGS)\
        $(LIBMICROHTTPD_CFLAGS)
@@ -12,9 +11,7 @@ AM_CPPFLAGS = -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = \
-       ../plib/libplib.a \
        ../lib/libpsensor.a \
-       ../libpsensor_json/libpsensor_json.a \
        $(SENSORS_LIBS) \
        $(JSON_LIBS) \
        $(LIBMICROHTTPD_LIBS)
@@ -22,12 +19,10 @@ LIBS = \
 if GTOP
 AM_CPPFLAGS += $(GTOP_CFLAGS)
 LIBS += $(GTOP_LIBS) 
-psensor_server_SOURCES += sysinfo.h sysinfo.c
 AM_LDFLAGS = -Wl,--as-needed
+psensor_server_SOURCES += sysinfo.h sysinfo.c
 endif
 
-
-
 dist_man_MANS =  psensor-server.1
 EXTRA_DIST = description.txt
 psensor-server.1: server.c $(top_srcdir)/configure.ac