Merge tag 'upstream/1.2.0'

[psensor-pkg-debian.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0f64275..8779d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,23 @@
 SUBDIRS = lib glade
 
+psensor_SOURCES = \
+       cfg.h cfg.c \
+       notify_cmd.c notify_cmd.h \
+       graph.h graph.c \
+       main.c \
+       pxdg.h pxdg.c \
+       rsensor.h \
+       ui.h ui.c \
+       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 \
+       ui_status.h ui_status.c \
+       ui_unity.h
+
 # -export-dynamic is need for defining handlers in the glade file.
 AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 
@@ -9,14 +27,13 @@ SUBDIRS += server
 endif
 endif
 
-# -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
+AM_CPPFLAGS =-Wall \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -DDATADIR=\""$(datadir)"\"\
+       -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS)\
-       $(GCONF_CFLAGS)\
        $(SENSORS_CFLAGS)
 
 DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -24,35 +41,17 @@ DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LIBS = \
        lib/libpsensor.a \
        $(GTK_LIBS)\
-       $(GCONF_LIBS)\
        $(PTHREAD_LIBS)\
-       $(SENSORS_LIBS)
+       $(SENSORS_LIBS) -lm
 
 if GTK
 if X11
 if XEXT
-if GCONF
 bin_PROGRAMS = psensor
 dist_man_MANS = psensor.1
 endif
 endif
 endif
-endif
-
-psensor_SOURCES = \
-       cfg.h cfg.c \
-       notify_cmd.c notify_cmd.h \
-       graph.h graph.c \
-       main.c \
-       ui.h ui.c \
-       ui_appindicator.h \
-       ui_color.h ui_color.c \
-       ui_graph.h ui_graph.c \
-       ui_pref.h ui_pref.c \
-       ui_sensorlist.h ui_sensorlist.c \
-       ui_sensorpref.h ui_sensorpref.c \
-       ui_status.h ui_status.c \
-       pxdg.h pxdg.c
 
 if GTOP
 AM_CPPFLAGS += $(GTOP_CFLAGS)
@@ -60,7 +59,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
@@ -88,31 +87,37 @@ AM_CPPFLAGS += $(ATASMART_CFLAGS)
 LIBS += $(ATASMART_LIBS)
 endif
 
+if LIBUDISKS2
+LIBS += $(LIBUDISKS2_LIBS)
+endif
+
 if UNITY
-psensor_SOURCES += ui_unity.h ui_unity.c
+psensor_SOURCES += ui_unity.c
 AM_CPPFLAGS += $(UNITY_CFLAGS)
 LIBS += $(UNITY_LIBS) 
 endif
 
 if CURL
 if JSON
-psensor_SOURCES += rsensor.h rsensor.c
+psensor_SOURCES += rsensor.c
 LIBS += $(CURL_LIBS) $(JSON_LIBS)
 AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
-EXTRA_DIST = description.txt psensor.schemas
-
-if GCONF
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = psensor.schemas
-
-install-data-local:
-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
-endif
-
+if HELP2MAN
 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)
+endif
+
+gsettings_SCHEMAS=psensor.gschema.xml
+
+EXTRA_DIST = description.txt\
+       $(gsettings_SCHEMAS)\
+       rsensor.c\
+       ui_appindicator.c\
+       ui_notify.c\
+       ui_unity.c
 
+@GSETTINGS_RULES@