X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=c89c8a35ca7d57efca1c521362b1828abcb1df6c;hb=039ecfa23216f4fe01d5b1a1ccd007b45392b156;hp=a16559319814a252ec95839e44fe1e1d1f55ffeb;hpb=c6d9fd757f429c0889e1a7620c7e7be69e6f71c9;p=psensor.git

diff --git a/src/Makefile.am b/src/Makefile.am
index a165593..c89c8a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,7 @@
-SUBDIRS = plib lib unity glade
+SUBDIRS = lib glade
 
-AM_LDFLAGS = -Wl,--as-needed 
-
-if JSON
-SUBDIRS += libpsensor_json
-endif
+# -export-dynamic is need for defining handlers in the glade file.
+AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 
 if LIBMICROHTTPD
 if JSON
@@ -12,39 +9,41 @@ SUBDIRS += server
 endif
 endif
 
-AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+# -no-deprecated-declarations to avoid some glib deprecation warnings
+AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/unity \
 	$(GTK_CFLAGS)\
 	$(GCONF_CFLAGS)\
 	$(SENSORS_CFLAGS)
 
-if LIBATIADL
-else
-AM_CPPFLAGS += -pedantic 
-endif
-
 DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = \
-	plib/libplib.a \
 	lib/libpsensor.a \
 	$(GTK_LIBS)\
 	$(GCONF_LIBS)\
+	$(PTHREAD_LIBS)\
 	$(SENSORS_LIBS)
 
 bin_PROGRAMS = psensor
 psensor_SOURCES = \
-	compat.h \
 	cfg.h cfg.c \
 	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_sensorpref.h ui_sensorpref.c \
+	ui_status.h ui_status.c
+
+if GTOP
+AM_CPPFLAGS += $(GTOP_CFLAGS)
+LIBS += $(GTOP_LIBS)
+endif
 
 if LIBNOTIFY
 psensor_SOURCES += ui_notify.h ui_notify.c
@@ -53,7 +52,7 @@ AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS)
 endif
 
 if APPINDICATOR 
-psensor_SOURCES += ui_appindicator.h ui_appindicator.c 
+psensor_SOURCES += ui_appindicator.c 
 LIBS +=	$(APPINDICATOR_LIBS)
 AM_CPPFLAGS += $(APPINDICATOR_CFLAGS)
 endif
@@ -63,21 +62,41 @@ AM_CPPFLAGS += $(NVIDIA_CFLAGS)
 LIBS +=  $(NVIDIA_LIBS)
 endif
 
+if LIBATIADL
+AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
+LIBS += $(LIBATIADL_LIBS)
+endif
+
+if ATASMART
+AM_CPPFLAGS += $(ATASMART_CFLAGS)
+LIBS += $(ATASMART_LIBS)
+endif
+
 if UNITY
+psensor_SOURCES += ui_unity.h ui_unity.c
 AM_CPPFLAGS += $(UNITY_CFLAGS)
-LIBS += unity/libpsensor_unity.a $(UNITY_LIBS) 
+LIBS += $(UNITY_LIBS) 
 endif
 
 if CURL
 if JSON
-psensor_SOURCES += rsensor.h rsensor.c plib/url.c plib/url.h
+psensor_SOURCES += rsensor.h rsensor.c
 LIBS += $(CURL_LIBS) $(JSON_LIBS)
 AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
 dist_man_MANS = psensor.1
-EXTRA_DIST = description.txt
+EXTRA_DIST = description.txt psensor.schemas
+
+
+if GCONF_SCHEMAS_INSTALL
+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
 
 psensor.1: main.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)