From cd9c8709e993679d644d805c02dc9ae349c7c3c9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 7 Nov 2011 11:45:36 +0000 Subject: [PATCH] added missing CPPFLAGS for Gtop (submitted by Lubos Stanek). --- NEWS | 1 + src/Makefile.am | 1 + src/Makefile.in | 43 ++++++++++++++++++++++--------------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index 8fbb06f..25c87bc 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ used by Fedora15) which introduces incompatible API changes. ** psensor: fixed compilation with libnotify 0.5.2 (submitted by Lubos Stanek). +** psensor: added missing CPPFLAGS for Gtop (submitted by Lubos Stanek). * v0.6.2.12 ** psensor: added -d option to enable debug log (written to $HOME/.psensor/log). diff --git a/src/Makefile.am b/src/Makefile.am index ccea9d5..a4b9fe6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,6 +42,7 @@ psensor_SOURCES = \ ui_sensorpref.h ui_sensorpref.c if GTOP +AM_CPPFLAGS += $(GTOP_CFLAGS) LIBS += $(GTOP_LIBS) endif diff --git a/src/Makefile.in b/src/Makefile.in index 0c04299..85811b9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -37,20 +37,21 @@ host_triplet = @host@ @JSON_TRUE@am__append_1 = libpsensor_json @JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_2 = server bin_PROGRAMS = psensor$(EXEEXT) -@GTOP_TRUE@am__append_3 = $(GTOP_LIBS) -@LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c -@LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS) -@LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS) -@APPINDICATOR_TRUE@am__append_7 = ui_appindicator.h ui_appindicator.c -@APPINDICATOR_TRUE@am__append_8 = $(APPINDICATOR_LIBS) -@APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_CFLAGS) -@NVIDIA_TRUE@am__append_10 = $(NVIDIA_CFLAGS) -@NVIDIA_TRUE@am__append_11 = $(NVIDIA_LIBS) -@UNITY_TRUE@am__append_12 = $(UNITY_CFLAGS) -@UNITY_TRUE@am__append_13 = unity/libpsensor_unity.a $(UNITY_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_14 = rsensor.h rsensor.c plib/url.c plib/url.h -@CURL_TRUE@@JSON_TRUE@am__append_15 = $(CURL_LIBS) $(JSON_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_16 = $(CURL_CFLAGS) $(JSON_CFLAGS) +@GTOP_TRUE@am__append_3 = $(GTOP_CFLAGS) +@GTOP_TRUE@am__append_4 = $(GTOP_LIBS) +@LIBNOTIFY_TRUE@am__append_5 = ui_notify.h ui_notify.c +@LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_LIBS) +@LIBNOTIFY_TRUE@am__append_7 = $(LIBNOTIFY_CFLAGS) +@APPINDICATOR_TRUE@am__append_8 = ui_appindicator.h ui_appindicator.c +@APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_LIBS) +@APPINDICATOR_TRUE@am__append_10 = $(APPINDICATOR_CFLAGS) +@NVIDIA_TRUE@am__append_11 = $(NVIDIA_CFLAGS) +@NVIDIA_TRUE@am__append_12 = $(NVIDIA_LIBS) +@UNITY_TRUE@am__append_13 = $(UNITY_CFLAGS) +@UNITY_TRUE@am__append_14 = unity/libpsensor_unity.a $(UNITY_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_15 = rsensor.h rsensor.c plib/url.c plib/url.h +@CURL_TRUE@@JSON_TRUE@am__append_16 = $(CURL_LIBS) $(JSON_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_17 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -209,9 +210,9 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = plib/libplib.a lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) \ - $(SENSORS_LIBS) $(am__append_3) $(am__append_5) \ - $(am__append_8) $(am__append_11) $(am__append_13) \ - $(am__append_15) + $(SENSORS_LIBS) $(am__append_4) $(am__append_6) \ + $(am__append_9) $(am__append_12) $(am__append_14) \ + $(am__append_16) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -308,13 +309,13 @@ AM_CPPFLAGS = -Wall -pedantic -Werror \ -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \ - $(am__append_6) $(am__append_9) $(am__append_10) \ - $(am__append_12) $(am__append_16) + $(am__append_3) $(am__append_7) $(am__append_10) \ + $(am__append_11) $(am__append_13) $(am__append_17) psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \ ui.c 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 $(am__append_4) $(am__append_7) \ - $(am__append_14) + ui_sensorpref.c $(am__append_5) $(am__append_8) \ + $(am__append_15) dist_man_MANS = psensor.1 EXTRA_DIST = description.txt all: all-recursive -- 2.7.4