From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 19 Dec 2011 22:27:01 +0000 (+0000)
Subject: Workarounded LP #905893
X-Git-Tag: v0.8.0.5~500
X-Git-Url: https://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=5e5bfc87cc0282c00bb956d1fefb3337620529de;p=psensor.git

Workarounded LP #905893
removed '-pedantic' option for src/lib compilation to avoid build failure during
the inclusion of a Glib header file.
added -Wno-deprecated-deprecations option for src to avoid build failure due to new gthread deprecation warnings.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 622d225..1cc4d74 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,8 @@ SUBDIRS += server
 endif
 endif
 
-AM_CPPFLAGS = -Wall -pedantic -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)\
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9fa01e7..9242946 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -33,8 +33,6 @@ if LIBATIADL
 LIBS += $(LIBATIADL_LIBS)
 AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
 libpsensor_a_SOURCES += amd.c
-else
-libpsensor_a_CFLAGS += -pedantic
 endif
 
 if GTOP