X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2FMakefile.am;h=2812001b46ac4d86d80f16e2d22e207ca3dfa09e;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hp=3b42c5654e51542f0c2d8cec0ee9468f982d26e7;hpb=86a2918a63cbf19152b12382438e283c8ec511a4;p=psensor.git

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 3b42c56..2812001 100644
--- 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 = -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,24 +11,29 @@ 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)
+	$(LIBMICROHTTPD_LIBS) \
+	$(PTHREAD_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
 
+if ATASMART
+AM_CPPFLAGS += $(ATASMART_CFLAGS)
+LIBS += $(ATASMART_LIBS)
+endif
 
+if HELP2MAN
+psensor-server.1: server.c $(top_srcdir)/configure.ac
+	$(MAKE) $(AM_MAKEFLAGS) psensor-server$(EXEEXT)
+	help2man --include=description.txt -N --name="Temperature and system monitoring Web server" --output=psensor-server.1 ./psensor-server$(EXEEXT)
+endif
 
 dist_man_MANS =  psensor-server.1
 EXTRA_DIST = description.txt
-psensor-server.1: server.c $(top_srcdir)/configure.ac
-	$(MAKE) $(AM_MAKEFLAGS) psensor-server$(EXEEXT)
-	help2man --include=description.txt -N --name="Temperature and system monitoring Web server" --output=psensor-server.1 ./psensor-server$(EXEEXT)
\ No newline at end of file