avoid to use cpp in code

[psensor.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5057822..7f7749c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,7 @@ SUBDIRS += server
 endif
 endif
 
-# -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
+AM_CPPFLAGS =-Wall -Werror \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -DDATADIR=\""$(datadir)"\"\
        -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\
@@ -25,7 +24,7 @@ LIBS = \
        lib/libpsensor.a \
        $(GTK_LIBS)\
        $(PTHREAD_LIBS)\
-       $(SENSORS_LIBS)
+       $(SENSORS_LIBS) -lm
 
 if GTK
 if X11
@@ -45,6 +44,7 @@ psensor_SOURCES = \
        ui_appindicator.h \
        ui_color.h ui_color.c \
        ui_graph.h ui_graph.c \
+       ui_notify.h \
        ui_pref.h ui_pref.c \
        ui_sensorlist.h ui_sensorlist.c \
        ui_sensorpref.h ui_sensorpref.c \
@@ -57,7 +57,7 @@ LIBS += $(GTOP_LIBS)
 endif
 
 if LIBNOTIFY
-psensor_SOURCES += ui_notify.h ui_notify.c
+psensor_SOURCES += ui_notify.c
 LIBS += $(LIBNOTIFY_LIBS)
 AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS)
 endif
@@ -85,6 +85,10 @@ AM_CPPFLAGS += $(ATASMART_CFLAGS)
 LIBS += $(ATASMART_LIBS)
 endif
 
+if LIBUDISKS2
+LIBS += $(LIBUDISKS2_LIBS)
+endif
+
 if UNITY
 psensor_SOURCES += ui_unity.h ui_unity.c
 AM_CPPFLAGS += $(UNITY_CFLAGS)
@@ -99,13 +103,11 @@ AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
-EXTRA_DIST = description.txt psensor.schemas
-
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
        help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
 
 gsettings_SCHEMAS=psensor.gschema.xml
-EXTRA_DIST=$(gsettings_SCHEMAS)
+EXTRA_DIST = description.txt $(gsettings_SCHEMAS)
 
 @GSETTINGS_RULES@