X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=76110950047081b5db38f46fb35b50b6766a1d47;hb=e2306d16931dc8c42997d3dd2f8a387a8cabd05b;hp=812153685e78d6b7f7cc20bf43f334b4b49d8d3d;hpb=27a60885389b016ac4087b3988ff3c45a19f7b8e;p=psensor.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8121536..7611095 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,12 +9,13 @@ SUBDIRS += server
 endif
 endif
 
-# -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+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@
@@ -22,13 +23,21 @@ 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
 bin_PROGRAMS = psensor
+dist_man_MANS = psensor.1
+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 \
@@ -38,7 +47,8 @@ psensor_SOURCES = \
 	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_status.h ui_status.c \
+	pxdg.h pxdg.c
 
 if GTOP
 AM_CPPFLAGS += $(GTOP_CFLAGS)
@@ -58,9 +68,11 @@ AM_CPPFLAGS += $(APPINDICATOR_CFLAGS)
 endif
 
 if NVIDIA
+if X11
 AM_CPPFLAGS += $(NVIDIA_CFLAGS)
 LIBS +=  $(NVIDIA_LIBS)
 endif
+endif
 
 if LIBATIADL
 AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
@@ -72,6 +84,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)
@@ -86,19 +102,11 @@ AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = psensor.schemas
-
-dist_man_MANS = psensor.1
-EXTRA_DIST = description.txt psensor.schemas
-
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
-endif
-
 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 = description.txt $(gsettings_SCHEMAS)
+
+@GSETTINGS_RULES@